Fix 8335 : Image syntax does not parse "px" in image caption correctly

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ba81800..b52c3f8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -363,6 +363,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   automatically logs the user in with the new password after changing
   it; pulling from slave meant the record was often not the updated
   one.
+* (bug 8335) Set image width to the first valid parameter found.
 
 == Languages updated ==
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 97a1f13..1642105 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4407,15 +4407,15 @@ class Parser
                                   && ! is_null( $match = $mwPage->matchVariableStartToEnd($val) ) ) {
                                # Select a page in a multipage document
                                $page = $match;
-                       } elseif ( $wgUseImageResize && ! is_null( $match = $mwWidth->matchVariableStartToEnd($val) ) ) {
+                       } elseif ( $wgUseImageResize && !$width && ! is_null( $match = $mwWidth->matchVariableStartToEnd($val) ) ) {
                                wfDebug( "img_width match: $match\n" );
                                # $match is the image width in pixels
                                $m = array();
-                               if ( preg_match( '/^([0-9]*)x([0-9]*)$/', $match, $m ) ) {
+                               if ( is_numeric($match) ) {
+                                       $width = intval($match);
+                               } elseif ( preg_match( '/^([0-9]*)x([0-9]*)$/', $match, $m ) ) {
                                        $width = intval( $m[1] );
                                        $height = intval( $m[2] );
-                               } else {
-                                       $width = intval($match);
                                }
                        } elseif ( ! is_null( $mwFramed->matchVariableStartToEnd($val) ) ) {
                                $framed=true;