From b8e3b0cb0660c3707b210a56e4983d2110a0b926 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sun, 11 Apr 2010 12:38:28 +0000
Subject: [PATCH] (bug 23148) Escape % in ImageMagick comments. Patch by
 Derk-Jan Hartman

---
 includes/media/Bitmap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index d004659b76..9b082b2a33 100644
--- 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");
-- 
2.20.1