r77280 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77279‎ | r77280 | r77281 >
Date:12:34, 25 November 2010
Author:catrope
Status:ok
Tags:
Comment:
Fix r77261 by adding the parentheses already added in 1.16wmf4 in r77264
Modified paths:
  • /trunk/phase3/includes/media/Bitmap.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/media/Bitmap.php
@@ -239,9 +239,9 @@
240240 // a pixel.
241241 " -thumbnail " . wfEscapeShellArg( "{$params['physicalDimensions']}!" ) .
242242 // Add the source url as a comment to the thumb, but don't add the flag if there's no comment
243 - $params['comment'] !== ''
 243+ ( $params['comment'] !== ''
244244 ? " -set comment " . wfEscapeShellArg( $this->escapeMagickProperty( $params['comment'] ) )
245 - : '' .
 245+ : '' ) .
246246 " -depth 8 $sharpen" .
247247 " {$animation_post} " .
248248 wfEscapeShellArg( $this->escapeMagickOutput( $params['dstPath'] ) ) . " 2>&1";

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77261Fix strange bug in ImageMagick call: if $params['comment'] was set to '' (whi...catrope22:50, 24 November 2010
r772641.16wmf4: Fix r77262 some more with parenthesescatrope23:06, 24 November 2010

Status & tagging log