From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Tue, 3 Aug 2010 20:50:58 +0000 (+0000)
Subject: Clean up code now that the old path is gone
X-Git-Tag: 1.31.0-rc.0~35746
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=1dd0888ea999133906a80576d538a69580eb7959;p=lhc%2Fweb%2Fwiklou.git

Clean up code now that the old path is gone
---

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 28f8a38345..d955f1f052 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -247,18 +247,6 @@ class CategoryViewer {
 
 		$dbr = wfGetDB( DB_SLAVE, 'category' );
 
-		$tables = array( 'page', 'categorylinks', 'category' );
-		$fields = array( 'page_title', 'page_namespace', 'page_len',
-			'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title',
-			'cat_subcats', 'cat_pages', 'cat_files' );
-		$conds = array( 'cl_to' => $this->title->getDBkey() );
-		$opts = array(
-			'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
-			'LIMIT' => $this->limit + 1,
-		);
-		$joins = array( 'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
-			'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) );
-
 		$this->nextPage = array(
 			'page' => null,
 			'subcat' => null,
@@ -281,12 +269,21 @@ class CategoryViewer {
 			}
 
 			$res = $dbr->select(
-				$tables,
-				array_merge( $fields, array( 'cl_sortkey_prefix' ) ),
-				$conds + $extraConds,
+				array( 'page', 'categorylinks', 'category' ),
+				array( 'page_title', 'page_namespace', 'page_len',
+					'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title',
+					'cat_subcats', 'cat_pages', 'cat_files', 'cl_sortkey_prefix' ),
+				array( 'cl_to' => $this->title->getDBkey() ) + $extraConds,
 				__METHOD__,
-				$opts + array( 'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey' ),
-				$joins
+				array(
+					'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+					'LIMIT' => $this->limit + 1,
+					'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey',
+				),
+				array(
+					'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
+					'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY )
+				)
 			);
 
 			$count = 0;