* (bug 23835) Need "thumbmime" result in "imageinfo" query

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 24692bf..ebcbd86 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -212,6 +212,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   similar to prop=categories's clcategorie
 * (bug 23834) Invalid "thumbwidth" and "thumbheight" in "imageinfo" query when
   thumbnailing larger than original image
+* (bug 23835) Need "thumbmime" result in "imageinfo" query
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 85d1532..4590615 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -222,6 +222,11 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                                $vals['thumbwidth'] = intval( $file->getWidth() );                                      
                                                $vals['thumbheight'] = intval( $file->getHeight() );
                                        }
+                                       
+                                       if ( isset( $prop['thumbmime'] ) ) {
+                                               $thumbFile = UnregisteredLocalFile::newFromPath( $mto->getPath(), false );
+                                               $vals['thumbmime'] = $thumbFile->getMimeType();
+                                       }
                                }
                        }
                        $vals['url'] = $file->getFullURL();
@@ -319,6 +324,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
                        'dimensions', // For backwards compatibility with Allimages
                        'sha1',
                        'mime',
+                       'thumbmime',
                        'metadata',
                        'archivename',
                        'bitdepth',