* (bug 6523) Fix SVG issue in rebuildImages.php

patch from http://bugzilla.wikimedia.org/show_bug.cgi?id=6523

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e3e4e64..f214495 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -636,6 +636,8 @@ Some default configuration options have changed:
 * Add "searchsubtitleinvalid" message for searches that are not valid titles.
 * (bug 5962) Update to Italian localisation
 * (bug 6530) Update to Indonesian localisation (id) #25
+* (bug 6523) Fix SVG issue in rebuildImages.php
+
 
 == Compatibility ==
 

diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 8f172c9..7caf681 100644 (file)
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -716,7 +716,7 @@ END;
                # Height and width
                $gis = false;
                if( $mime == 'image/svg' ) {
-                       $gis = wfGetSVGsize( $this->imagePath );
+                       $gis = wfGetSVGsize( $filename );
                } elseif( $magic->isPHPImageType( $mime ) ) {
                        $gis = getimagesize( $filename );
                } else {