https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113688
Revision: 113688
Author: aaron
Date: 2012-03-13 00:05:23 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
Made wfShellMaintenanceCmd() not totally broken due to excess shell escaping.
Modified Paths:
--------------
trunk/phase3/includes/GlobalFunctions.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php 2012-03-12 23:58:35 UTC (rev
113687)
+++ trunk/phase3/includes/GlobalFunctions.php 2012-03-13 00:05:23 UTC (rev
113688)
@@ -2929,8 +2929,8 @@
$cmd[] = $options['wrapper'];
}
$cmd[] = $script;
- // Escape each parameter for shell
- return implode( " ", array_map( 'wfEscapeShellArg', array_merge( $cmd,
$parameters ) ) );
+ // Build up the full command, shell escaping each parameter
+ return implode( ' ', array_merge( $cmd, array_map( 'wfEscapeShellArg',
$parameters ) ) );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
