* (bug 23834) Invalid "thumbwidth" and "thumbheight" in "imageinfo" query when thumbn...

Minor comment casing tweak in File.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ab91f93..b80eb88 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -208,6 +208,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   using token and username.
 * (bug 23524) Api Modules as followup to bug 14473 (Add iwlinks table to 
   track inline interwiki link usage.
+* (bug 23834) Invalid "thumbwidth" and "thumbheight" in "imageinfo" query when
+  thumbnailing larger than original image
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 2d58003..85d1532 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -212,8 +212,16 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                $mto = $file->transform( array( 'width' => $scale['width'], 'height' => $scale['height'] ) );
                                if ( $mto && !$mto->isError() ) {
                                        $vals['thumburl'] = wfExpandUrl( $mto->getUrl() );
-                                       $vals['thumbwidth'] = intval( $mto->getWidth() );
-                                       $vals['thumbheight'] = intval( $mto->getHeight() );
+
+                                       //bug 23834 - If the URL's are the same, we haven't resized it, so shouldn't give the wanted
+                                       //thumbnail sizes for the thumbnail actual size
+                                       if ( $mto->getUrl() !== $file->getUrl() ) {
+                                               $vals['thumbwidth'] = intval( $mto->getWidth() );                                       
+                                               $vals['thumbheight'] = intval( $mto->getHeight() );
+                                       } else {
+                                               $vals['thumbwidth'] = intval( $file->getWidth() );                                      
+                                               $vals['thumbheight'] = intval( $file->getHeight() );
+                                       }
                                }
                        }
                        $vals['url'] = $file->getFullURL();

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 9e98348..2bc7f06 100644 (file)
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1054,7 +1054,7 @@ abstract class File {
        }
 
        /**
-        * Get an image size array like that returned by getimagesize(), or false if it
+        * Get an image size array like that returned by getImageSize(), or false if it
         * can't be determined.
         *
         * @param $fileName String: The filename