From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 20 Feb 2011 13:51:24 +0000 (+0000)
Subject: Remove error duplication in ApiQueryStashImageInfo by using non hardcoded prefix... 
X-Git-Tag: 1.31.0-rc.0~31860
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=adf3254f4704546846143d83395c89dac44f0537;p=lhc%2Fweb%2Fwiklou.git

Remove error duplication in ApiQueryStashImageInfo by using non hardcoded prefix in ApiQueryImageInfo
---

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index b76454665b..cd82be5887 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -500,7 +500,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	public function getPossibleErrors() {
 		$p = $this->getModulePrefix();
 		return array_merge( parent::getPossibleErrors(), array(
-			array( 'code' => 'iiurlwidth', 'info' => 'iiurlheight cannot be used without iiurlwidth' ),
+			array( 'code' => 'iiurlwidth', 'info' => "{$p}urlheight cannot be used without {$p}urlwidth" ),
 			array( 'code' => 'urlparam', 'info' => "Invalid value for {$p}urlparam" ),
 			array( 'code' => 'urlparam_no_width', 'info' => "{$p}urlparam requires {$p}urlwidth" ),
 			array( 'code' => 'urlparam_urlwidth_mismatch', 'info' => "The width set in {$p}urlparm doesnt't " .
diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php
index ef649aa729..e3fdbea695 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -137,12 +137,6 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
 		return 'Returns image information for stashed images';
 	}
 
-	public function getPossibleErrors() {
-		return array_merge( parent::getPossibleErrors(), array(
-			array( 'code' => 'siiurlwidth', 'info' => 'siiurlheight cannot be used without iiurlwidth' ),
-		) );
-	}
-
 	protected function getExamples() {
 		return array(
 			'api.php?action=query&prop=stashimageinfo&siisessionkey=124sd34rsdf567',