X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildFileCache.php;h=924457aec69513865ee772de93685a758eac2095;hb=bfa365a8ac4abe25a696a4ff337cb26c60748262;hp=12ed9facafab989958f542a065d9f009a8846883;hpb=703206f38c63ba51e75a8aa49724f112ab78047d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 12ed9facaf..924457aec6 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -49,7 +49,7 @@ class RebuildFileCache extends Maintenance {
 
 	public function execute() {
 		global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, $wgRequestTime;
-		global $wgTitle, $wgOut;
+		global $wgOut;
 		if ( !$wgUseFileCache ) {
 			$this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true );
 		}
@@ -104,22 +104,22 @@ class RebuildFileCache extends Maintenance {
 				$rebuilt = false;
 				$wgRequestTime = microtime( true ); # bug 22852
 
-				$wgTitle = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-				if ( null == $wgTitle ) {
+				$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
+				if ( null == $title ) {
 					$this->output( "Page {$row->page_id} has bad title\n" );
 					continue; // broken title?
 				}
 
 				$context = new RequestContext;
-				$context->setTitle( $wgTitle );
-				$article = Article::newFromTitle( $wgTitle, $context );
+				$context->setTitle( $title );
+				$article = Article::newFromTitle( $title, $context );
 				$context->setWikiPage( $article->getPage() );
 
 				$wgOut = $context->getOutput(); // set display title
 
 				// If the article is cacheable, then load it
 				if ( $article->isFileCacheable() ) {
-					$cache = HTMLFileCache::newFromTitle( $wgTitle, 'view' );
+					$cache = HTMLFileCache::newFromTitle( $title, 'view' );
 					if ( $cache->isCacheGood() ) {
 						if ( $overwrite ) {
 							$rebuilt = true;
@@ -131,9 +131,9 @@ class RebuildFileCache extends Maintenance {
 					ob_start( array( &$cache, 'saveToFileCache' ) ); // save on ob_end_clean()
 					$wgUseFileCache = false; // hack, we don't want $article fiddling with filecache
 					$article->view();
-					wfSuppressWarnings(); // header notices
+					MediaWiki\suppressWarnings(); // header notices
 					$wgOut->output();
-					wfRestoreWarnings();
+					MediaWiki\restoreWarnings();
 					$wgUseFileCache = true;
 					ob_end_clean(); // clear buffer
 					if ( $rebuilt ) {
@@ -151,11 +151,6 @@ class RebuildFileCache extends Maintenance {
 			$blockEnd += $this->mBatchSize;
 		}
 		$this->output( "Done!\n" );
-
-		// Remove these to be safe
-		if ( isset( $wgTitle ) ) {
-			unset( $wgTitle );
-		}
 	}
 }