| Index: branches/wmf/1.16wmf4/includes/media/Bitmap.php |
| — | — | @@ -157,7 +157,7 @@ |
| 158 | 158 | // or ImageMagick may decide your ratio is wrong and slice off |
| 159 | 159 | // a pixel. |
| 160 | 160 | " -thumbnail " . wfEscapeShellArg( "{$physicalWidth}x{$physicalHeight}!" ) . |
| 161 | | - " -set comment " . wfEscapeShellArg( "{$descriptionUrl}" ) . |
| | 161 | + " -set comment " . wfEscapeShellArg( str_replace( '%', '%%', $descriptionUrl ) ) . |
| 162 | 162 | " -depth 8 $sharpen " . |
| 163 | 163 | wfEscapeShellArg($dstPath) . " 2>&1"; |
| 164 | 164 | wfDebug( __METHOD__.": running ImageMagick: $cmd\n"); |
| Property changes on: branches/wmf/1.16wmf4/includes/media/Bitmap.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 165 | 165 | - /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 |
| 166 | 166 | + /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 |