| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | $physicalHeight = $params['physicalHeight']; |
| 62 | 62 | $clientWidth = $params['width']; |
| 63 | 63 | $clientHeight = $params['height']; |
| 64 | | - $descriptionUrl = $params['descriptionUrl']; |
| | 64 | + $descriptionUrl = isset( $params['descriptionUrl'] ) ? "File source: ". $params['descriptionUrl'] : ''; |
| 65 | 65 | $srcWidth = $image->getWidth(); |
| 66 | 66 | $srcHeight = $image->getHeight(); |
| 67 | 67 | $mimeType = $image->getMimeType(); |
| — | — | @@ -155,7 +155,7 @@ |
| 156 | 156 | // or ImageMagick may decide your ratio is wrong and slice off |
| 157 | 157 | // a pixel. |
| 158 | 158 | " -thumbnail " . wfEscapeShellArg( "{$physicalWidth}x{$physicalHeight}!" ) . |
| 159 | | - " -set comment " . wfEscapeShellArg( "File source: {$descriptionUrl}" ) . |
| | 159 | + " -set comment " . wfEscapeShellArg( "{$descriptionUrl}" ) . |
| 160 | 160 | " -depth 8 $sharpen " . |
| 161 | 161 | wfEscapeShellArg($dstPath) . " 2>&1"; |
| 162 | 162 | wfDebug( __METHOD__.": running ImageMagick: $cmd\n"); |