dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "FauxRequest: Remove influence from $wgRequest on getFullRequestURL()"
[lhc/web/wiklou.git]
/
includes
/
media
/
DjVuHandler.php
diff --git
a/includes/media/DjVuHandler.php
b/includes/media/DjVuHandler.php
index
a0e7f2c
..
3b904e8
100644
(file)
--- a/
includes/media/DjVuHandler.php
+++ b/
includes/media/DjVuHandler.php
@@
-21,6
+21,7
@@
* @ingroup Media
*/
use MediaWiki\MediaWikiServices;
* @ingroup Media
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\Shell;
/**
* Handler for DjVu images
/**
* Handler for DjVu images
@@
-204,7
+205,7
@@
class DjVuHandler extends ImageHandler {
# 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.
# 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
(
+ $cmd = '(' .
Shell::escape
(
$wgDjvuRenderer,
"-format=ppm",
"-page={$page}",
$wgDjvuRenderer,
"-format=ppm",
"-page={$page}",
@@
-213,7
+214,7
@@
class DjVuHandler extends ImageHandler {
if ( $wgDjvuPostProcessor ) {
$cmd .= " | {$wgDjvuPostProcessor}";
}
if ( $wgDjvuPostProcessor ) {
$cmd .= " | {$wgDjvuPostProcessor}";
}
- $cmd .= ' > ' .
wfEscapeShellArg
( $dstPath ) . ') 2>&1';
+ $cmd .= ' > ' .
Shell::escape
( $dstPath ) . ') 2>&1';
wfDebug( __METHOD__ . ": $cmd\n" );
$retval = '';
$err = wfShellExec( $cmd, $retval );
wfDebug( __METHOD__ . ": $cmd\n" );
$retval = '';
$err = wfShellExec( $cmd, $retval );