Merge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle

2016-10-05 09:46:36 +08:00
parent c7fc66f2ac b9b474182a
commit d905fc31bd
1 changed files with 13 additions and 5 deletions
@@ -91,12 +91,20 @@ $commandoptions = "";
 // If parallel run then use utilparallel.
 if ($options['parallel'] && $options['parallel'] > 1) {
    $utilfile = 'util.php';
-}
+    // Sanitize all input options, so they can be passed to util.
+    foreach ($options as $option => $value) {
+        if ($value) {
+            $commandoptions .= " --$option='$value'";
+        }
+    }
+} else {
+    // Only sanitize options for single run.
+    $cmdoptionsforsinglerun = array('run-with-theme');

-// Sanitize input options, so they can be passed to util.
-foreach ($options as $option => $value) {
-    if ($value) {
-        $commandoptions .= " --$option='$value'";
+    foreach ($cmdoptionsforsinglerun as $option) {
+        if (!empty($options[$option])) {
+            $commandoptions .= " --$option='$options[$option]'";
+        }
    }
 }