From a6a58fd0ddd2d2393863731bcc386875c3af16b9 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 13 Mar 2012 00:05:23 +0000
Subject: [PATCH] Made wfShellMaintenanceCmd() not totally broken due to excess
 shell escaping.

---
 includes/GlobalFunctions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2a81c9a0bc..2aebd61771 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2929,8 +2929,8 @@ function wfShellMaintenanceCmd( $script, array $parameters = array(), array $opt
 		$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 ) ) );
 }
 
 /**
-- 
2.20.1