| Index: trunk/extensions/ConfirmAccount/ConfirmAccount.setup.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | $frontendDir = "$dir/frontend"; |
| 23 | 23 | $langDir = "$dir/frontend/language/"; |
| 24 | 24 | $spActionDir = "$dir/frontend/specialpages/actions"; |
| 25 | | - $spReportDir = "$dir/frontend/specialpages/reports"; |
| | 25 | + //$spReportDir = "$dir/frontend/specialpages/reports"; |
| 26 | 26 | |
| 27 | 27 | # Main i18n file and special page alias file |
| 28 | 28 | $messagesFiles['ConfirmAccount'] = "$langDir/ConfirmAccount.i18n.php"; |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContest.php |
| — | — | @@ -256,7 +256,7 @@ |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | if ( $req->getSessionData( 'contestant-challenge' ) ) { |
| 260 | | - $challenge = ContestChallenge::s()->selectRow( 'id', array( 'title' => $req->getSessionData( 'contestant-' . $field ) ) ); |
| | 260 | + $challenge = ContestChallenge::s()->selectRow( 'id', array( 'title' => $req->getSessionData( 'contestant-challenge' ) ) ); |
| 261 | 261 | |
| 262 | 262 | if ( $challenge !== false ) { |
| 263 | 263 | $conds['contestant_challenge_id'] = $challenge->getField( 'id' ); |
| Property changes on: branches/wmf/1.18wmf1/extensions/Contest |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 264 | 264 | Merged /trunk/extensions/Contest:r108841 |