From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 14 Sep 2016 19:37:36 +0000 (-0700)
Subject: Fix broken select() call in rebuildFileCache.php
X-Git-Tag: 1.31.0-rc.0~5574^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=4246b3796a149230ee7d0fb6732d2f248a7ee76c;p=lhc%2Fweb%2Fwiklou.git

Fix broken select() call in rebuildFileCache.php

A few other small cleanups

Change-Id: Ie62cf93feb5a57f629a893c7ea298ed902b52789
---

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 649557ed28..b278e989f1 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -74,10 +74,10 @@ class RebuildFileCache extends Maintenance {
 		$overwrite = $this->getOption( 'overwrite', false );
 		$start = ( $start > 0 )
 			? $start
-			: $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+			: $dbr->selectField( 'page', 'MIN(page_id)', false, __METHOD__ );
 		$end = ( $end > 0 )
 			? $end
-			: $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+			: $dbr->selectField( 'page', 'MAX(page_id)', false, __METHOD__ );
 		if ( !$start ) {
 			$this->error( "Nothing to do.", true );
 		}
@@ -93,9 +93,11 @@ class RebuildFileCache extends Maintenance {
 		// Go through each page and save the output
 		while ( $blockEnd <= $end ) {
 			// Get the pages
-			$res = $dbr->select( 'page', [ 'page_namespace', 'page_title', 'page_id' ],
+			$res = $dbr->select( 'page',
+				[ 'page_namespace', 'page_title', 'page_id' ],
 				[ 'page_namespace' => MWNamespace::getContentNamespaces(),
 					"page_id BETWEEN $blockStart AND $blockEnd" ],
+				__METHOD__,
 				[ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ]
 			);
 
@@ -119,7 +121,7 @@ class RebuildFileCache extends Maintenance {
 
 				// If the article is cacheable, then load it
 				if ( $article->isFileCacheable() ) {
-					$cache = HTMLFileCache::newFromTitle( $title, 'view' );
+					$cache = new HTMLFileCache( $title, 'view' );
 					if ( $cache->isCacheGood() ) {
 						if ( $overwrite ) {
 							$rebuilt = true;