Revert r31473 -- causes fatal errors.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 83de22b..c6ae9bc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -61,7 +61,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11561) Fix fatal error when calling action=revert to non-image page
 * (bug 12430) Fix call to private method LinkFilter::makeRegex fatal error in
   maintenance/cleanupSpam.php
-* (bug 13214) <gallery> doesn't resize images which are smaller than 120*120
 
 === API changes in 1.13 ===
 

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index f0aec76..46ecd16 100644 (file)
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -235,6 +235,7 @@ class ImageGallery
                if( $this->mCaption )
                        $s .= "\n\t<caption>{$this->mCaption}</caption>";
 
+               $params = array( 'width' => $this->mWidths, 'height' => $this->mHeights );
                $i = 0;
                foreach ( $this->mImages as $pair ) {
                        $nt = $pair[0];
@@ -245,12 +246,6 @@ class ImageGallery
                        wfRunHooks( 'BeforeGalleryFindFile', array( &$this, &$nt, &$time ) );
 
                        $img = wfFindFile( $nt, $time );
-                       
-                       if ( $this->mWidths > $img->getWidth() && $this->mHeights > $img->getHeight()  ) {
-                               $params = array( 'width' => $img->getWidth(), 'height' => $img->getHeight() );
-                       } else {
-                               $params = array( 'width' => $this->mWidths, 'height' => $this->mHeights );
-                       }                       
 
                        if( $nt->getNamespace() != NS_IMAGE || !$img ) {
                                # We're dealing with a non-image, spit out the name and be done with it.