From 81e3985652d1ea272c4725e339f98cc2a16691ad Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Mon, 20 Jul 2015 16:27:27 +0800
Subject: [PATCH 1/2] MDL-50416 environment: remove slasharguments warning from
 install

---
 lib/upgradelib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index bf22448d2ae..d1cab6e5917 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -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;

From eb9bf73f21198580565536f77420aae8f05c4f06 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Tue, 4 Aug 2015 09:55:49 +0800
Subject: [PATCH 2/2] MDL-50416 environment: add missing slasharguments checks

---
 admin/environment.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin/environment.xml b/admin/environment.xml
index f18975de311..50b72db0d59 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -1134,6 +1134,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_CHECKS>
   </MOODLE>
   <MOODLE version="2.8" requires="2.2">