http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84433
Revision: 84433
Author: reedy
Date: 2011-03-20 23:50:59 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Start of bug 27586/bug 27589
Turn properties into a filterable key/value pair, but leave exisiting wrapper
methods in place for the moment
Will finish it off later
Modified Paths:
--------------
trunk/phase3/includes/api/ApiQueryImageInfo.php
Modified: trunk/phase3/includes/api/ApiQueryImageInfo.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryImageInfo.php 2011-03-20 23:11:59 UTC
(rev 84432)
+++ trunk/phase3/includes/api/ApiQueryImageInfo.php 2011-03-20 23:50:59 UTC
(rev 84433)
@@ -475,22 +475,32 @@
* @return Array
*/
public static function getPropertyNames() {
+ return array_keys( self::getProperties() );
+ }
+
+ /**
+ * Returns array key value pairs of
+ *
+ * @static
+ * @return array
+ */
+ private static function getProperties() {
return array(
- 'timestamp',
- 'user',
- 'userid',
- 'comment',
- 'parsedcomment',
- 'url',
- 'size',
- 'dimensions', // For backwards compatibility with
Allimages
- 'sha1',
- 'mime',
- 'thumbmime',
- 'mediatype',
- 'metadata',
- 'archivename',
- 'bitdepth',
+ 'timestamp' => ' timestamp - Adds timestamp
for the uploaded version',
+ 'user' => ' user - Adds the user who
uploaded the image version',
+ 'userid' => ' userid - Add the user ID
that uploaded the image version',
+ 'comment' => ' comment - Comment on the
version',
+ 'parsedcomment' => ' parsedcomment - Parse the comment
on the version',
+ 'url' => ' url - Gives URL to the
image and the description page',
+ 'size' => ' size - Adds the size of
the image in bytes and the height, width and page count (if applicable)',
+ 'dimensions' => ' dimensions - Alias for size',
// For backwards compatibility with Allimages
+ 'sha1' => ' sha1 - Adds SHA-1 hash
for the image',
+ 'mime' => ' mime - Adds MIME type of
the image',
+ 'thumbmime' => ' thumbmime - Adds MIME type of
the image thumbnail (requires url)',
+ 'mediatype' => ' mediatype - Adds the media
type of the image',
+ 'metadata' => ' metadata - Lists EXIF
metadata for the version of the image',
+ 'archivename' => ' archivename - Adds the file
name of the archive version for non-latest versions',
+ 'bitdepth' => ' bitdepth - Adds the bit
depth of the version',
);
}
@@ -501,24 +511,10 @@
* @return array
*/
public static function getPropertyDescriptions() {
- return array(
- 'What image information to get:',
- ' timestamp - Adds timestamp for the
uploaded version',
- ' user - Adds the user who uploaded
the image version',
- ' userid - Add the user ID that uploaded
the image version',
- ' comment - Comment on the version',
- ' parsedcomment - Parse the comment on the
version',
- ' url - Gives URL to the image and
the description page',
- ' size - Adds the size of the image in
bytes and the height, width and page count (if applicable)',
- ' dimensions - Alias for size',
- ' sha1 - Adds SHA-1 hash for the
image',
- ' mime - Adds MIME type of the image',
- ' thumbmime - Adds MIME type of the image
thumbnail (requires url)',
- ' mediatype - Adds the media type of the
image',
- ' metadata - Lists EXIF metadata for the
version of the image',
- ' archivename - Adds the file name of the
archive version for non-latest versions',
- ' bitdepth - Adds the bit depth of the
version',
- );
+ return array_merge(
+ array( 'What image information to get:' ),
+ array_values( self::getProperties() )
+ );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
