[MediaWiki-commits] [Gerrit] Exclude prop=uploadwarning from allimages and stashimageinfo - change (mediawiki/core)

2014-03-21 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Exclude prop=uploadwarning from allimages and stashimageinfo
..


Exclude prop=uploadwarning from allimages and stashimageinfo

Was added with I4a0af8986f924cd127a73828e72da6998f28536c,
but looks only useful on prop=imageinfo

Change-Id: I59c5f11f83be7e59f317686ab7fa16ad6fda008b
---
M includes/api/ApiQueryAllImages.php
M includes/api/ApiQueryStashImageInfo.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/ApiQueryAllImages.php 
b/includes/api/ApiQueryAllImages.php
index 0591fa9..6e2c31f 100644
--- a/includes/api/ApiQueryAllImages.php
+++ b/includes/api/ApiQueryAllImages.php
@@ -378,7 +378,7 @@
);
}
 
-   private $propertyFilter = array( 'archivename', 'thumbmime' );
+   private $propertyFilter = array( 'archivename', 'thumbmime', 
'uploadwarning' );
 
public function getResultProperties() {
return array_merge(
diff --git a/includes/api/ApiQueryStashImageInfo.php 
b/includes/api/ApiQueryStashImageInfo.php
index 3595cf9..6a49e60 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -72,7 +72,7 @@
 
private $propertyFilter = array(
'user', 'userid', 'comment', 'parsedcomment',
-   'mediatype', 'archivename',
+   'mediatype', 'archivename', 'uploadwarning',
);
 
public function getAllowedParams() {

-- 
To view, visit https://gerrit.wikimedia.org/r/112341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59c5f11f83be7e59f317686ab7fa16ad6fda008b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Exclude prop=uploadwarning from allimages and stashimageinfo - change (mediawiki/core)

2014-02-09 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112341

Change subject: Exclude prop=uploadwarning from allimages and stashimageinfo
..

Exclude prop=uploadwarning from allimages and stashimageinfo

Was added with I4a0af8986f924cd127a73828e72da6998f28536c,
but looks only useful on prop=imageinfo

Change-Id: I59c5f11f83be7e59f317686ab7fa16ad6fda008b
---
M includes/api/ApiQueryAllImages.php
M includes/api/ApiQueryStashImageInfo.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/112341/1

diff --git a/includes/api/ApiQueryAllImages.php 
b/includes/api/ApiQueryAllImages.php
index 4095bd8..4646bc4 100644
--- a/includes/api/ApiQueryAllImages.php
+++ b/includes/api/ApiQueryAllImages.php
@@ -378,7 +378,7 @@
);
}
 
-   private $propertyFilter = array( 'archivename', 'thumbmime' );
+   private $propertyFilter = array( 'archivename', 'thumbmime', 
'uploadwarning' );
 
public function getResultProperties() {
return array_merge(
diff --git a/includes/api/ApiQueryStashImageInfo.php 
b/includes/api/ApiQueryStashImageInfo.php
index 248b3d8..b438e75 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -72,7 +72,7 @@
 
private $propertyFilter = array(
'user', 'userid', 'comment', 'parsedcomment',
-   'mediatype', 'archivename',
+   'mediatype', 'archivename', 'uploadwarning',
);
 
public function getAllowedParams() {

-- 
To view, visit https://gerrit.wikimedia.org/r/112341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59c5f11f83be7e59f317686ab7fa16ad6fda008b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits