Fix bounding box feature of thumbnails (e.g. |200x200px|)

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 4651ba8..a8fd0eb 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -193,10 +193,10 @@ class MagicWord {
                $matchcount = preg_match( $this->getVariableStartToEndRegex(), $text, $matches );
                if ( $matchcount == 0 ) {
                        return NULL;
-               } elseif ( count($matches) == 1 ) {
+               } elseif ( count($matches) == 2 ) {
                        return $matches[0];
                } else {
-                       return $matches[1];
+                       return $matches[2];
                }
        }
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 6e4f447..c3cae13 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1767,8 +1767,6 @@ class Skin {
 
                                if (    ( ! $height === false )
                                     && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
-                                       print "height=$height<br>\nimg->getHeight() = ".$img->getHeight()."<br>\n";
-                                       print 'rescaling by factor '. $height / $img->getHeight() . "<br>\n";
                                        $width = $img->getWidth() * $height / $img->getHeight();
                                }
                                if ( '' == $manual_thumb ) $url = $img->createThumb( $width );