(bug 23148) Escape % in ImageMagick comments. Patch by Derk-Jan Hartman

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index d004659..9b082b2 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -157,7 +157,7 @@ class BitmapHandler extends ImageHandler {
                                // or ImageMagick may decide your ratio is wrong and slice off
                                // a pixel.
                                " -thumbnail " . wfEscapeShellArg( "{$physicalWidth}x{$physicalHeight}!" ) .
-                               " -set comment " . wfEscapeShellArg( "{$descriptionUrl}" ) .
+                               " -set comment " . wfEscapeShellArg( str_replace( '%', '%%', $descriptionUrl ) ) .
                                " -depth 8 $sharpen " .
                                wfEscapeShellArg($dstPath) . " 2>&1";
                        wfDebug( __METHOD__.": running ImageMagick: $cmd\n");