From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 31 Oct 2012 18:21:30 +0000 (+0100)
Subject: Fix prop=userid in list=protectedtitles
X-Git-Tag: 1.31.0-rc.0~21621^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=97ed408107dd2f98836c122429c80b83a8bc5327;p=lhc%2Fweb%2Fwiklou.git

Fix prop=userid in list=protectedtitles

userid was only set with prop=user, prop=userid was ignored

Change-Id: I4e061afdd0507724fa9dc22ad76ae2e2ee710d6b
---

diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php
index 14aed28d7a..02050056ba 100644
--- a/includes/api/ApiQueryProtectedTitles.php
+++ b/includes/api/ApiQueryProtectedTitles.php
@@ -98,7 +98,7 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
 					$vals['user'] = $row->user_name;
 				}
 
-				if ( isset( $prop['user'] ) ) {
+				if ( isset( $prop['userid'] ) || /*B/C*/isset( $prop['user'] ) ) {
 					$vals['userid'] = $row->pt_user;
 				}
 
@@ -231,6 +231,9 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
 				),
 				'userid' => 'integer'
 			),
+			'userid' => array(
+				'userid' => 'integer'
+			),
 			'comment' => array(
 				'comment' => 'string'
 			),