summaryrefslogtreecommitdiff
path: root/includes/media/DjVu.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-01-29 20:39:08 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-01-29 20:39:08 +0100
commit1b65fa2a5f4c48b02ceda934e9c1aee2d03ce453 (patch)
treee9bb7fa7d4aa7d815810ea807556e49c3a00adf7 /includes/media/DjVu.php
parent224b22a051051f6c2e494c3a2fb4adb42898e2d1 (diff)
Update to MediaWiki 1.22.2
Diffstat (limited to 'includes/media/DjVu.php')
-rw-r--r--includes/media/DjVu.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index b9e89d9d..9b8116e9 100644
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -177,9 +177,12 @@ class DjVuHandler extends ImageHandler {
$srcPath = $image->getLocalRefPath();
# Use a subshell (brackets) to aggregate stderr from both pipeline commands
# before redirecting it to the overall stdout. This works in both Linux and Windows XP.
- $cmd = '(' . wfEscapeShellArg( $wgDjvuRenderer ) . " -format=ppm -page={$page}" .
- " -size={$params['physicalWidth']}x{$params['physicalHeight']} " .
- wfEscapeShellArg( $srcPath );
+ $cmd = '(' . wfEscapeShellArg(
+ $wgDjvuRenderer,
+ "-format=ppm",
+ "-page={$page}",
+ "-size={$params['physicalWidth']}x{$params['physicalHeight']}",
+ $srcPath );
if ( $wgDjvuPostProcessor ) {
$cmd .= " | {$wgDjvuPostProcessor}";
}