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 "rcfeed: Replace usage of deprecated class RCFeedEngine (in comments)"
[lhc/web/wiklou.git]
/
includes
/
export
/
DumpPipeOutput.php
diff --git
a/includes/export/DumpPipeOutput.php
b/includes/export/DumpPipeOutput.php
index
26010da
..
a353c44
100644
(file)
--- a/
includes/export/DumpPipeOutput.php
+++ b/
includes/export/DumpPipeOutput.php
@@
-25,6
+25,8
@@
* @file
*/
* @file
*/
+use MediaWiki\Shell\Shell;
+
/**
* @ingroup Dump
*/
/**
* @ingroup Dump
*/
@@
-38,7
+40,7
@@
class DumpPipeOutput extends DumpFileOutput {
*/
function __construct( $command, $file = null ) {
if ( !is_null( $file ) ) {
*/
function __construct( $command, $file = null ) {
if ( !is_null( $file ) ) {
- $command .= " > " .
wfEscapeShellArg
( $file );
+ $command .= " > " .
Shell::escape
( $file );
}
$this->startCommand( $command );
}
$this->startCommand( $command );
@@
-94,7
+96,7
@@
class DumpPipeOutput extends DumpFileOutput {
$this->renameOrException( $newname );
if ( $open ) {
$command = $this->command;
$this->renameOrException( $newname );
if ( $open ) {
$command = $this->command;
- $command .= " > " .
wfEscapeShellArg
( $this->filename );
+ $command .= " > " .
Shell::escape
( $this->filename );
$this->startCommand( $command );
}
}
$this->startCommand( $command );
}
}