From: Sean Pringle <springle@wikimedia.org>
Date: Tue, 10 Dec 2013 06:20:33 +0000 (+1000)
Subject: Remove problem forced index
X-Git-Tag: 1.31.0-rc.0~17687^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=060a78745e2dda6591ed07469b952bf57ed8cee1;p=lhc%2Fweb%2Fwiklou.git

Remove problem forced index

bug: 58256
Change-Id: I48484b39f99d92f51e531324870236b00b481553
---

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 43d485582f..006510df7f 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -524,15 +524,14 @@ class NewPagesPager extends ReverseChronologicalPager {
 		$username = $this->opts->getValue( 'username' );
 		$user = Title::makeTitleSafe( NS_USER, $username );
 
+		$rcIndexes = array();
+
 		if ( $namespace !== false ) {
 			if ( $this->opts->getValue( 'invert' ) ) {
 				$conds[] = 'rc_namespace != ' . $this->mDb->addQuotes( $namespace );
 			} else {
 				$conds['rc_namespace'] = $namespace;
 			}
-			$rcIndexes = array( 'new_name_timestamp' );
-		} else {
-			$rcIndexes = array( 'rc_timestamp' );
 		}
 
 		# $wgEnableNewpagesUserFilter - temp WMF hack
@@ -572,11 +571,17 @@ class NewPagesPager extends ReverseChronologicalPager {
 		wfRunHooks( 'SpecialNewpagesConditions',
 			array( &$this, $this->opts, &$conds, &$tables, &$fields, &$join_conds ) );
 
+		$options = array();
+
+		if ( $rcIndexes ) {
+			$options = array( 'USE INDEX' => array( 'recentchanges' => $rcIndexes ) );
+		}
+
 		$info = array(
 			'tables' => $tables,
 			'fields' => $fields,
 			'conds' => $conds,
-			'options' => array( 'USE INDEX' => array( 'recentchanges' => $rcIndexes ) ),
+			'options' => $options,
 			'join_conds' => $join_conds
 		);