| Index: trunk/phase3/includes/api/ApiQueryAllimages.php |
| — | — | @@ -199,21 +199,7 @@ |
| 200 | 200 | 'limit' => 'How many images in total to return', |
| 201 | 201 | 'sha1' => "SHA1 hash of image. Overrides {$this->getModulePrefix()}sha1base36", |
| 202 | 202 | 'sha1base36' => 'SHA1 hash of image in base 36 (used in MediaWiki)', |
| 203 | | - 'prop' => array( |
| 204 | | - 'Which properties to get', |
| 205 | | - ' timestamp - Adds the timestamp when the image was upload', |
| 206 | | - ' user - Adds the username of the last uploader', |
| 207 | | - ' userid - Adds the user ID of the last uploader', |
| 208 | | - ' comment - Adds the comment of the last upload', |
| 209 | | - ' url - Adds the URL of the image and its description page', |
| 210 | | - ' size - Adds the size of the image in bytes and its height and width', |
| 211 | | - ' dimensions - Alias of size', |
| 212 | | - ' sha1 - Adds the SHA-1 hash of the image', |
| 213 | | - ' mime - Adds the MIME of the image', |
| 214 | | - ' thumbmime - Adds the MIME of the tumbnail for the image', |
| 215 | | - ' archivename - Adds the file name of the archive version for non-latest versions', |
| 216 | | - ' bitdepth - Adds the bit depth of the version', |
| 217 | | - ), |
| | 203 | + 'prop' => ApiQueryImageInfo::getPropertyDescriptions(), |
| 218 | 204 | ); |
| 219 | 205 | } |
| 220 | 206 | |
| Index: trunk/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -424,6 +424,8 @@ |
| 425 | 425 | |
| 426 | 426 | /** |
| 427 | 427 | * Returns all possible parameters to iiprop |
| | 428 | + * @static |
| | 429 | + * @return Array |
| 428 | 430 | */ |
| 429 | 431 | public static function getPropertyNames() { |
| 430 | 432 | return array( |
| — | — | @@ -444,15 +446,14 @@ |
| 445 | 447 | ); |
| 446 | 448 | } |
| 447 | 449 | |
| 448 | | - |
| 449 | 450 | /** |
| 450 | | - * Return the API documentation for the parameters. |
| 451 | | - * @return {Array} parameter documentation. |
| | 451 | + * Returns the descriptions for the properties provided by getPropertyNames() |
| | 452 | + * |
| | 453 | + * @static |
| | 454 | + * @return array |
| 452 | 455 | */ |
| 453 | | - public function getParamDescription() { |
| 454 | | - $p = $this->getModulePrefix(); |
| | 456 | + public static function getPropertyDescriptions() { |
| 455 | 457 | return array( |
| 456 | | - 'prop' => array( |
| 457 | 458 | 'What image information to get:', |
| 458 | 459 | ' timestamp - Adds timestamp for the uploaded version', |
| 459 | 460 | ' user - Adds the user who uploaded the image version', |
| — | — | @@ -468,7 +469,17 @@ |
| 469 | 470 | ' metadata - Lists EXIF metadata for the version of the image', |
| 470 | 471 | ' archivename - Adds the file name of the archive version for non-latest versions', |
| 471 | 472 | ' bitdepth - Adds the bit depth of the version', |
| 472 | | - ), |
| | 473 | + ); |
| | 474 | + } |
| | 475 | + |
| | 476 | + /** |
| | 477 | + * Return the API documentation for the parameters. |
| | 478 | + * @return {Array} parameter documentation. |
| | 479 | + */ |
| | 480 | + public function getParamDescription() { |
| | 481 | + $p = $this->getModulePrefix(); |
| | 482 | + return array( |
| | 483 | + 'prop' => self::getPropertyDescriptions(), |
| 473 | 484 | 'urlwidth' => array( "If {$p}prop=url is set, a URL to an image scaled to this width will be returned.", |
| 474 | 485 | 'Only the current version of the image can be scaled' ), |
| 475 | 486 | 'urlheight' => "Similar to {$p}urlwidth. Cannot be used without {$p}urlwidth", |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -149,6 +149,7 @@ |
| 150 | 150 | * Expose list of skins in meta=siteinfo |
| 151 | 151 | * (bug 26548) Add iiurlparam param to query=imageinfo and query=stashimageinfo |
| 152 | 152 | * (bug 27201) Special:WhatLinksHere output no longer contains duplicate IDs |
| | 153 | +* (bug 27205) aiprop=metadata and aiprop=parsedcomment need help text |
| 153 | 154 | |
| 154 | 155 | === Languages updated in 1.18 === |
| 155 | 156 | |