From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 31 Dec 2012 19:15:50 +0000 (-0500)
Subject: (bug 43251) API prop=pageprops ppprop should accept multiple values
X-Git-Tag: 1.31.0-rc.0~20637
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=0ae0c665f532ec6d5818633510651863d1aaf177;p=lhc%2Fweb%2Fwiklou.git

(bug 43251) API prop=pageprops ppprop should accept multiple values

There is no reason for this parameter not to accept multiple values, the
query is structurally exactly the same as for something like
prop=categories&clcategories=....

Unless, of course, we need to support page props with "|" in the name.

Change-Id: I38cd83e213ede8e626d55c079c5c1b6f7e727336
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 184812cdfc..6143030f49 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -212,6 +212,7 @@ production.
   iicontinue).
 * Add supports for all pageset capabilities - generators, redirects, converttitles to
   action=purge and action=setnotificationtimestamp.
+* (bug 43251) prop=pageprops&ppprop= now accepts multiple props to query.
 
 === API internal changes in 1.21 ===
 * For debugging only, a new global $wgDebugAPI removes many API restrictions when true.
diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php
index 9dd2c6a800..2de57106e9 100644
--- a/includes/api/ApiQueryPageProps.php
+++ b/includes/api/ApiQueryPageProps.php
@@ -60,7 +60,10 @@ class ApiQueryPageProps extends ApiQueryBase {
 		}
 
 		# Force a sort order to ensure that properties are grouped by page
-		$this->addOption( 'ORDER BY', 'pp_page' );
+		# But only if pp_page is not constant in the WHERE clause.
+		if ( count( $pages ) > 1 ) {
+			$this->addOption( 'ORDER BY', 'pp_page' );
+		}
 
 		$res = $this->select( __METHOD__ );
 		$currentPage = 0; # Id of the page currently processed
@@ -122,14 +125,16 @@ class ApiQueryPageProps extends ApiQueryBase {
 	public function getAllowedParams() {
 		return array(
 			'continue' => null,
-			'prop' => null,
+			'prop' => array(
+				ApiBase::PARAM_ISMULTI => true,
+			),
 		);
 	}
 
 	public function getParamDescription() {
 		return array(
 			'continue' => 'When more results are available, use this to continue',
-			'prop' => 'Page prop to look on the page for. Useful for checking whether a certain page uses a certain page prop.'
+			'prop' => 'Only list these props. Useful for checking whether a certain page uses a certain page prop',
 		);
 	}