Followup r89515, fix double spacing in API Error message

[lhc/web/wiklou.git] / includes / api / ApiQueryImageInfo.php

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 5321a43..f8152d4 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -107,7 +107,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        }
                                        break;
                                }
-                               
+
                                // Check if we can make the requested thumbnail, and get transform parameters.
                                $finalThumbParams = $this->mergeThumbParams( $img, $scale, $params['urlparam'] );
 
@@ -119,9 +119,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        ( is_null( $params['end'] ) || $img->getTimestamp() >= $params['end'] )
                                ) {
                                        $gotOne = true;
-                                       
+
                                        $fit = $this->addPageSubItem( $pageId,
-                                               self::getInfo( $img, $prop, $result, $finalThumbParams ) );
+                                               self::getInfo( $img, $prop, $result,
+                                                       $finalThumbParams, $params['metadataversion'] ) );
                                        if ( !$fit ) {
                                                if ( count( $pageIds[NS_IMAGE] ) == 1 ) {
                                                        // See the 'the user is screwed' comment above
@@ -150,7 +151,8 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                                break;
                                        }
                                        $fit = $this->addPageSubItem( $pageId,
-                                               self::getInfo( $oldie, $prop, $result, $finalThumbParams ) );
+                                               self::getInfo( $oldie, $prop, $result,
+                                                       $finalThumbParams, $params['metadataversion'] ) );
                                        if ( !$fit ) {
                                                if ( count( $pageIds[NS_IMAGE] ) == 1 ) {
                                                        $this->setContinueEnumParameter( 'start',
@@ -215,7 +217,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
         * to know which handler, since handlers can make their own parameters.
         * @param File $image Image that params are for.
         * @param Array $thumbParams thumbnail parameters from getScale
-        * @param String String of otherParams (iiurlparam).
+        * @param String $otherParams of otherParams (iiurlparam).
         * @return Array of parameters for transform.
         */
        protected function mergeThumbParams ( $image, $thumbParams, $otherParams ) {
@@ -265,9 +267,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
         * @param $prop Array of properties to get (in the keys)
         * @param $result ApiResult object
         * @param $thumbParams Array containing 'width' and 'height' items, or null
+        * @param $version string Version of image metadata (for things like jpeg which have different versions).
         * @return Array: result array
         */
-       static function getInfo( $file, $prop, $result, $thumbParams = null ) {
+       static function getInfo( $file, $prop, $result, $thumbParams = null, $version = 'latest' ) {
                $vals = array();
                // Timestamp is shown even if the file is revdelete'd in interface
                // so do same here.
@@ -357,9 +360,11 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                                $vals['thumbheight'] = intval( $file->getHeight() );
                                        }
 
-                                       if ( isset( $prop['thumbmime'] ) ) {
-                                               $thumbFile = UnregisteredLocalFile::newFromPath( $mto->getPath(), false );
-                                               $vals['thumbmime'] = $thumbFile->getMimeType();
+                                       if ( isset( $prop['thumbmime'] ) && $file->getHandler() ) {
+                                               list( $ext, $mime ) = $file->getHandler()->getThumbType( 
+                                                       substr( $mto->getPath(), strrpos( $mto->getPath(), '.' ) + 1 ), 
+                                                       $file->getMimeType(), $thumbParams );
+                                               $vals['thumbmime'] = $mime;
                                        }
                                } else if ( $mto && $mto->isError() ) {
                                        $vals['thumberror'] = $mto->toText();
@@ -374,14 +379,17 @@ class ApiQueryImageInfo extends ApiQueryBase {
                }
 
                if ( $meta ) {
-                       $metadata = $file->getMetadata();
-                       $vals['metadata'] = $metadata ? self::processMetaData( unserialize( $metadata ), $result ) : null;
+                       $metadata = unserialize( $file->getMetadata() );
+                       if ( $version !== 'latest' ) {
+                               $metadata = $file->convertMetadataVersion( $metadata, $version );
+                       }
+                       $vals['metadata'] = $metadata ? self::processMetaData( $metadata, $result ) : null;
                }
 
                if ( $mime ) {
                        $vals['mime'] = $file->getMimeType();
                }
-               
+
                if ( $mediatype ) {
                        $vals['mediatype'] = $file->getMediaType();
                }
@@ -461,6 +469,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                ApiBase::PARAM_TYPE => 'integer',
                                ApiBase::PARAM_DFLT => -1
                        ),
+                       'metadataversion' => array(
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_DFLT => '1',
+                       ),
                        'urlparam' => array(
                                ApiBase::PARAM_DFLT => '',
                                ApiBase::PARAM_TYPE => 'string',
@@ -474,7 +486,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
         *
         * @param array $filter List of properties to filter out
         *
-        * @static
         * @return Array
         */
        public static function getPropertyNames( $filter = array() ) {
@@ -484,7 +495,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
        /**
         * Returns array key value pairs of properties and their descriptions
         *
-        * @static
         * @return array
         */
        private static function getProperties() {
@@ -512,7 +522,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
         * 
         * @param array $filter List of properties to filter out
         *
-        * @static
         * @return array
         */
        public static function getPropertyDescriptions( $filter = array() ) {
@@ -538,6 +547,8 @@ class ApiQueryImageInfo extends ApiQueryBase {
                        'limit' => 'How many image revisions to return',
                        'start' => 'Timestamp to start listing from',
                        'end' => 'Timestamp to stop listing at',
+                       'metadataversion' => array( "Version of metadata to use. if 'latest' is specified, use latest version.", 
+                                               "Defaults to '1' for backwards compatibility" ),
                        'continue' => 'If the query response includes a continue value, use it here to get another page of results'
                );
        }