From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 16 Feb 2011 23:38:21 +0000 (+0000)
Subject: * (bug 27479) API error when using both prop=pageprops and prop=info&inprop=displaytitle
X-Git-Tag: 1.31.0-rc.0~31956
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=5db6b7ab5cf149f7aa9209a538447d6e181b139e;p=lhc%2Fweb%2Fwiklou.git

* (bug 27479) API error when using both prop=pageprops and prop=info&inprop=displaytitle

Followup r75282

Patch by Brad Jorsch
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a33bffa398..27e7f27b3e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -173,6 +173,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 27199) Thumbnail urls can be fetched for old files as well
 * (bug 27376) when using ApiBase::PARAM_TYPE => 'integer' without a min or
   max value, api doesn't validate the input is actually an integer
+* (bug 27479) API error when using both prop=pageprops and
+  prop=info&inprop=displaytitle
 
 === Languages updated in 1.18 ===
 
diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php
index 1e9fa48150..087f8c8cb5 100644
--- a/includes/api/ApiQueryPageProps.php
+++ b/includes/api/ApiQueryPageProps.php
@@ -112,7 +112,7 @@ class ApiQueryPageProps extends ApiQueryBase {
 	 * @return bool True if it fits in the result
 	 */
 	private function addPageProps( $result, $page, $props ) {
-		$fit = $result->addValue( array( 'query', 'pages' ), $page, $props );
+		$fit = $result->addValue( array( 'query', 'pages', $page ), 'pageprops', $props );
 
 		if ( !$fit ) {
 			$this->setContinueEnumParameter( 'continue', $page );