From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 17 Jan 2012 12:38:23 +0000 (+0000)
Subject: * Reordered code to not create a RequestContext if the title is invalid
X-Git-Tag: 1.31.0-rc.0~25223
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=fc85d44def599a6386db528618bd663151d23078;p=lhc%2Fweb%2Fwiklou.git

* Reordered code to not create a RequestContext if the title is invalid
* Use Article::newFromTitle() instead of new Article()
* Set the WikiPage in the context from the created Article object
---

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index ee693f6484..b725f0318a 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -86,16 +86,21 @@ class RebuildFileCache extends Maintenance {
 			$dbw->begin(); // for any changes
 			foreach ( $res as $row ) {
 				$rebuilt = false;
-				$wgRequestTime = wfTime(); # bug 22852
-				$context = new RequestContext;
+				$wgRequestTime = microtime( true ); # bug 22852
+				
 				$wgTitle = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-				$context->setTitle( $wgTitle );
 				if ( null == $wgTitle ) {
 					$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->setWikiPage( $article->getPage() );
+
 				$wgOut = $context->getOutput(); // set display title
-				$article = new Article( $wgTitle );
+
 				// If the article is cacheable, then load it
 				if ( $article->isFileCacheable() ) {
 					$cache = HTMLFileCache::newFromTitle( $wgTitle, 'view' );