http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65402
Revision: 65402
Author: tstarling
Date: 2010-04-21 15:37:31 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
MFT r64932, bug 23148: ImageMagick comment escaping bug
Modified Paths:
--------------
branches/wmf/1.16wmf4/includes/media/Bitmap.php
Property Changed:
----------------
branches/wmf/1.16wmf4/includes/media/Bitmap.php
Modified: branches/wmf/1.16wmf4/includes/media/Bitmap.php
===================================================================
--- branches/wmf/1.16wmf4/includes/media/Bitmap.php 2010-04-21 15:35:12 UTC
(rev 65401)
+++ branches/wmf/1.16wmf4/includes/media/Bitmap.php 2010-04-21 15:37:31 UTC
(rev 65402)
@@ -157,7 +157,7 @@
// 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");
Property changes on: branches/wmf/1.16wmf4/includes/media/Bitmap.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692
+ /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692,64932,65401
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
