From 1dd0888ea999133906a80576d538a69580eb7959 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Tue, 3 Aug 2010 20:50:58 +0000 Subject: [PATCH] Clean up code now that the old path is gone --- includes/CategoryPage.php | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) 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; -- 2.20.1