From 0e702e154afd9c160d515c3adf68c277b1bda606 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 19 Jul 2005 02:55:56 +0000 Subject: [PATCH] * Using Database::select() instead of a raw SQL query * Cleanup --- includes/SpecialAllpages.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php index 079cb0e8c5..b25503ee70 100644 --- a/includes/SpecialAllpages.php +++ b/includes/SpecialAllpages.php @@ -211,21 +211,27 @@ function indexShowline( $inpoint, $outpoint, $namespace = NS_MAIN ) { */ function indexShowChunk( $namespace = NS_MAIN, $from, $including = false ) { global $wgOut, $wgUser, $indexMaxperpage, $wgContLang; - $sk = $wgUser->getSkin(); - $maxPlusOne = $indexMaxperpage + 1; - $out = ''; - $dbr =& wfGetDB( DB_SLAVE ); - $page = $dbr->tableName( 'page' ); + $fname = 'indexShowChunk'; + $sk = $wgUser->getSkin(); + $fromTitle = Title::newFromURL( $from ); $fromKey = is_null( $fromTitle ) ? '' : $fromTitle->getDBkey(); - $sql = "SELECT page_namespace,page_title FROM $page" . - " WHERE page_namespace=$namespace" . - " AND page_title >= ". $dbr->addQuotes( $fromKey ) . - " ORDER BY page_title LIMIT " . $maxPlusOne; - $res = $dbr->query( $sql, 'indexShowChunk' ); + $dbr =& wfGetDB( DB_SLAVE ); + $res = $dbr->select( 'page', + array( 'page_namespace', 'page_title' ), + array( + 'page_namespace' => $namespace, + 'page_title >= ' . $dbr->addQuotes( $fromKey ) + ), + $fname, + array( + 'ORDER BY' => 'page_title', + 'LIMIT' => $indexMaxperpage + 1 + ) + ); ### FIXME: side link to previous -- 2.20.1