| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -250,7 +250,7 @@ |
| 251 | 251 | * @return Return the text of this revision |
| 252 | 252 | */ |
| 253 | 253 | public function getContent() { |
| 254 | | - global $wgUser, $wgContLang, $wgOut, $wgMessageCache; |
| | 254 | + global $wgUser, $wgContLang, $wgMessageCache; |
| 255 | 255 | |
| 256 | 256 | wfProfileIn( __METHOD__ ); |
| 257 | 257 | |
| — | — | @@ -826,9 +826,8 @@ |
| 827 | 827 | * page of the given title. |
| 828 | 828 | */ |
| 829 | 829 | public function view() { |
| 830 | | - global $wgUser, $wgOut, $wgRequest, $wgContLang; |
| 831 | | - global $wgEnableParserCache, $wgStylePath, $wgParser; |
| 832 | | - global $wgUseTrackbacks, $wgUseFileCache; |
| | 830 | + global $wgUser, $wgOut, $wgRequest, $wgParser; |
| | 831 | + global $wgUseFileCache; |
| 833 | 832 | |
| 834 | 833 | wfProfileIn( __METHOD__ ); |
| 835 | 834 | |
| — | — | @@ -1048,7 +1047,7 @@ |
| 1049 | 1048 | * Article::view() only, other callers should use the DifferenceEngine class. |
| 1050 | 1049 | */ |
| 1051 | 1050 | public function showDiffPage() { |
| 1052 | | - global $wgOut, $wgRequest, $wgUser; |
| | 1051 | + global $wgRequest, $wgUser; |
| 1053 | 1052 | |
| 1054 | 1053 | $diff = $wgRequest->getVal( 'diff' ); |
| 1055 | 1054 | $rcid = $wgRequest->getVal( 'rcid' ); |
| — | — | @@ -1285,7 +1284,7 @@ |
| 1286 | 1285 | * Show the footer section of an ordinary page view |
| 1287 | 1286 | */ |
| 1288 | 1287 | public function showViewFooter() { |
| 1289 | | - global $wgOut, $wgUseTrackbacks, $wgRequest; |
| | 1288 | + global $wgOut, $wgUseTrackbacks; |
| 1290 | 1289 | |
| 1291 | 1290 | # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page |
| 1292 | 1291 | if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) { |
| — | — | @@ -2359,7 +2358,7 @@ |
| 2360 | 2359 | * Mark this particular edit/page as patrolled |
| 2361 | 2360 | */ |
| 2362 | 2361 | public function markpatrolled() { |
| 2363 | | - global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser; |
| | 2362 | + global $wgOut, $wgRequest; |
| 2364 | 2363 | |
| 2365 | 2364 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 2366 | 2365 | |
| — | — | @@ -3125,7 +3124,7 @@ |
| 3126 | 3125 | * Perform a deletion and output success or failure messages |
| 3127 | 3126 | */ |
| 3128 | 3127 | public function doDelete( $reason, $suppress = false ) { |
| 3129 | | - global $wgOut, $wgUser; |
| | 3128 | + global $wgOut; |
| 3130 | 3129 | |
| 3131 | 3130 | $id = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); |
| 3132 | 3131 | |
| — | — | @@ -3181,8 +3180,7 @@ |
| 3182 | 3181 | * @return boolean true if successful |
| 3183 | 3182 | */ |
| 3184 | 3183 | public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true ) { |
| 3185 | | - global $wgUseSquid, $wgDeferredUpdateList; |
| 3186 | | - global $wgUseTrackbacks; |
| | 3184 | + global $wgDeferredUpdateList, $wgUseTrackbacks; |
| 3187 | 3185 | |
| 3188 | 3186 | wfDebug( __METHOD__ . "\n" ); |
| 3189 | 3187 | |
| — | — | @@ -3493,7 +3491,7 @@ |
| 3494 | 3492 | * User interface for rollback operations |
| 3495 | 3493 | */ |
| 3496 | 3494 | public function rollback() { |
| 3497 | | - global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol; |
| | 3495 | + global $wgUser, $wgOut, $wgRequest; |
| 3498 | 3496 | |
| 3499 | 3497 | $details = null; |
| 3500 | 3498 | |
| — | — | @@ -4006,6 +4004,7 @@ |
| 4007 | 4005 | $revision->insertOn( $dbw ); |
| 4008 | 4006 | $this->updateRevisionOn( $dbw, $revision ); |
| 4009 | 4007 | |
| | 4008 | + global $wgUser; |
| 4010 | 4009 | wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) ); |
| 4011 | 4010 | |
| 4012 | 4011 | wfProfileOut( __METHOD__ ); |
| — | — | @@ -4420,7 +4419,7 @@ |
| 4421 | 4420 | * @return string containing parsed output |
| 4422 | 4421 | */ |
| 4423 | 4422 | public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) { |
| 4424 | | - global $wgParser, $wgOut, $wgEnableParserCache, $wgUseFileCache; |
| | 4423 | + global $wgParser, $wgEnableParserCache, $wgUseFileCache; |
| 4425 | 4424 | |
| 4426 | 4425 | if ( !$parserOptions ) { |
| 4427 | 4426 | $parserOptions = $this->getParserOptions(); |
| — | — | @@ -4500,8 +4499,6 @@ |
| 4501 | 4500 | __METHOD__ |
| 4502 | 4501 | ); |
| 4503 | 4502 | |
| 4504 | | - global $wgContLang; |
| 4505 | | - |
| 4506 | 4503 | foreach ( $res as $row ) { |
| 4507 | 4504 | $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = true; |
| 4508 | 4505 | } |
| — | — | @@ -4596,7 +4593,7 @@ |
| 4597 | 4594 | * @param $oldid mixed integer Revision ID or null |
| 4598 | 4595 | */ |
| 4599 | 4596 | public function getParserOutput( $oldid = null ) { |
| 4600 | | - global $wgEnableParserCache, $wgUser, $wgOut; |
| | 4597 | + global $wgEnableParserCache, $wgUser; |
| 4601 | 4598 | |
| 4602 | 4599 | // Should the parser cache be used? |
| 4603 | 4600 | $useParserCache = $wgEnableParserCache && |