| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -325,16 +325,14 @@ |
| 326 | 326 | * @param $type String |
| 327 | 327 | */ |
| 328 | 328 | protected function feed( $type ) { |
| 329 | | - global $wgFeed, $wgFeedClasses, $wgFeedLimit; |
| | 329 | + global $wgFeed, $wgFeedClasses, $wgFeedLimit, $wgOut; |
| 330 | 330 | |
| 331 | 331 | if ( !$wgFeed ) { |
| 332 | | - global $wgOut; |
| 333 | 332 | $wgOut->addWikiMsg( 'feed-unavailable' ); |
| 334 | 333 | return; |
| 335 | 334 | } |
| 336 | 335 | |
| 337 | 336 | if( !isset( $wgFeedClasses[$type] ) ) { |
| 338 | | - global $wgOut; |
| 339 | 337 | $wgOut->addWikiMsg( 'feed-invalid' ); |
| 340 | 338 | return; |
| 341 | 339 | } |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -182,7 +182,7 @@ |
| 183 | 183 | * @private |
| 184 | 184 | */ |
| 185 | 185 | function addNewAccount() { |
| 186 | | - global $wgUser, $wgEmailAuthentication; |
| | 186 | + global $wgUser, $wgEmailAuthentication, $wgOut; |
| 187 | 187 | |
| 188 | 188 | # Create the account and abort if there's a problem doing so |
| 189 | 189 | $u = $this->addNewAccountInternal(); |
| — | — | @@ -197,7 +197,6 @@ |
| 198 | 198 | |
| 199 | 199 | # Send out an email authentication message if needed |
| 200 | 200 | if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) ) { |
| 201 | | - global $wgOut; |
| 202 | 201 | $error = $u->sendConfirmationMail(); |
| 203 | 202 | if( WikiError::isError( $error ) ) { |
| 204 | 203 | $wgOut->addWikiMsg( 'confirmemail_sendfailed', $error->getMessage() ); |
| — | — | @@ -224,7 +223,6 @@ |
| 225 | 224 | } |
| 226 | 225 | } else { |
| 227 | 226 | # Confirm that the account was created |
| 228 | | - global $wgOut; |
| 229 | 227 | $self = SpecialPage::getTitleFor( 'Userlogin' ); |
| 230 | 228 | $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) ); |
| 231 | 229 | $wgOut->setArticleRelated( false ); |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -380,16 +380,14 @@ |
| 381 | 381 | * @param $type String |
| 382 | 382 | */ |
| 383 | 383 | protected function feed( $type ) { |
| 384 | | - global $wgFeed, $wgFeedClasses, $wgFeedLimit; |
| | 384 | + global $wgFeed, $wgFeedClasses, $wgFeedLimit, $wgOut; |
| 385 | 385 | |
| 386 | 386 | if( !$wgFeed ) { |
| 387 | | - global $wgOut; |
| 388 | 387 | $wgOut->addWikiMsg( 'feed-unavailable' ); |
| 389 | 388 | return; |
| 390 | 389 | } |
| 391 | 390 | |
| 392 | 391 | if( !isset( $wgFeedClasses[$type] ) ) { |
| 393 | | - global $wgOut; |
| 394 | 392 | $wgOut->addWikiMsg( 'feed-invalid' ); |
| 395 | 393 | return; |
| 396 | 394 | } |
| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -365,7 +365,7 @@ |
| 366 | 366 | # Disallow deletions of big articles |
| 367 | 367 | $bigHistory = $article->isBigDeletion(); |
| 368 | 368 | if( $bigHistory && !$nt->userCan( 'bigdelete' ) ) { |
| 369 | | - global $wgLang, $wgDeleteRevisionsLimit; |
| | 369 | + global $wgDeleteRevisionsLimit; |
| 370 | 370 | $this->showForm( array('delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) ); |
| 371 | 371 | return; |
| 372 | 372 | } |