From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 26 Jul 2008 08:42:29 +0000 (+0000)
Subject: $res is a ResultWrapper object
X-Git-Tag: 1.31.0-rc.0~46360
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=add351a2622ba22d01d9eb8b65796341155c488f;p=lhc%2Fweb%2Fwiklou.git

$res is a ResultWrapper object
---

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index a145eb68d1..331c01ad53 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -102,7 +102,7 @@ class SpecialRecentChanges extends SpecialPage {
 			return;
 		}
 		$dbr = wfGetDB( DB_SLAVE );
-		while( $row = $dbr->fetchObject( $res ) ){
+		while( $row = $res->fetchObject() ){
 			$rows[] = $row;
 			if ( !$feedFormat ) {
 				// User page and talk links
@@ -111,7 +111,7 @@ class SpecialRecentChanges extends SpecialPage {
 			}
 
 		}
-		$dbr->freeResult( $res );
+		$res->free();
 
 		if ( $feedFormat ) {
 			list( $feed, $feedObj ) = $this->getFeedObject( $feedFormat );
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index d773fb77ee..e5f5b6020f 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -145,7 +145,7 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 
 		$res = $dbr->query( $sql, __METHOD__ );
 
-		if( $dbr->numRows( $res ) == 0 )
+		if( $res->numRows() == 0 )
 			$this->mResultEmpty = true;
 
 		return $res;