From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 20 May 2011 21:30:35 +0000 (+0000)
Subject: Similarise queries to that of SpecialWatchlist
X-Git-Tag: 1.31.0-rc.0~30054
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=6ea5008bf75f4461ab93488aa19b5e851b3a471c;p=lhc%2Fweb%2Fwiklou.git

Similarise queries to that of SpecialWatchlist
---

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 1aaa450fb8..120c7ca744 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -115,17 +115,21 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 		}
 
 		$this->addTables( array(
+			'recentchanges',
 			'watchlist',
 			'page',
-			'recentchanges'
 		) );
 
 		$userId = $user->getId();
+		$this->addJoinConds( array( 'watchlist' => array('INNER JOIN',
+			array(
+				'wl_user' => $userId,
+				'wl_namespace=rc_namespace',
+				'wl_title=rc_title'
+		) ) ) );
+		$this->addJoinConds( array( 'page' => array( 'LEFT JOIN','rc_cur_id=page_id' ) ) );
+
 		$this->addWhere( array(
-			'wl_namespace = rc_namespace',
-			'wl_title = rc_title',
-			'rc_cur_id = page_id',
-			'wl_user' => $userId,
 			'rc_deleted' => 0,
 		) );