https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112915
Revision: 112915
Author: ialex
Date: 2012-03-02 20:35:01 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
* Don't execute the LinkBatch if there are now rows
* Call methods directly on ResultWrapper instead of DatabaseBase
Modified Paths:
--------------
trunk/phase3/includes/QueryPage.php
Modified: trunk/phase3/includes/QueryPage.php
===================================================================
--- trunk/phase3/includes/QueryPage.php 2012-03-02 20:11:24 UTC (rev 112914)
+++ trunk/phase3/includes/QueryPage.php 2012-03-02 20:35:01 UTC (rev 112915)
@@ -295,7 +295,7 @@
$res = $this->reallyDoQuery( $limit, false );
$num = false;
if ( $res ) {
- $num = $dbr->numRows( $res );
+ $num = $res->numRows();
# Fetch results
$vals = array();
while ( $res && $row = $dbr->fetchObject( $res ) ) {
@@ -733,6 +733,10 @@
* Cache page existence for performance
*/
function preprocessResults( $db, $res ) {
+ if ( !$res->numRows() ) {
+ return;
+ }
+
$batch = new LinkBatch;
foreach ( $res as $row ) {
$batch->add( $row->namespace, $row->title );
@@ -740,9 +744,7 @@
$batch->execute();
// Back to start for display
- if ( $db->numRows( $res ) > 0 )
- // If there are no rows we get an error seeking.
- $db->dataSeek( $res, 0 );
+ $res->seek( 0 );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
