From adf3254f4704546846143d83395c89dac44f0537 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 20 Feb 2011 13:51:24 +0000 Subject: [PATCH] Remove error duplication in ApiQueryStashImageInfo by using non hardcoded prefix in ApiQueryImageInfo --- includes/api/ApiQueryImageInfo.php | 2 +- includes/api/ApiQueryStashImageInfo.php | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) 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', -- 2.20.1