Merge branch 'MDL-50416-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE

2015-08-04 20:00:43 +02:00
parent fdf6a66c52 eb9bf73f21
commit a06efb59b3
2 changed files with 6 additions and 1 deletions
@@ -1135,6 +1135,11 @@
          <ON_ERROR message="quizattemptsupgradedmessage" />
        </FEEDBACK>
      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
        <FEEDBACK>
          <ON_CHECK message="unsupporteddbtablerowformat" />
@@ -2239,7 +2239,7 @@ function check_database_storage_engine(environment_results $result) {
 function check_slasharguments(environment_results $result){
    global $CFG;

-    if (empty($CFG->slasharguments)) {
+    if (!during_initial_install() && empty($CFG->slasharguments)) {
        $result->setInfo('slasharguments');
        $result->setStatus(false);
        return $result;