summaryrefslogtreecommitdiff
path: root/includes/media/DjVu.php
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-02-01 21:35:16 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-02-01 21:35:16 -0500
commit064cec79ca4c8201de0d06bbca6cb7a5345d11be (patch)
tree1d2221b7d5fe2744d82d1241a736a9d9b0666ded /includes/media/DjVu.php
parent5744df39e15f85c6cc8a9faf8924d77e76d2b216 (diff)
parent1b65fa2a5f4c48b02ceda934e9c1aee2d03ce453 (diff)
Merge branch 'archwiki'
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}";
}