Merge branch 'MDL-66169-master' of https://github.com/snake/moodle

safatshahin · Sep 25, 2019 · e8a2d53 · e8a2d53
2 parents 31b822e + cddbdb2
commit e8a2d53
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/admin/testoutgoingmailconf.php b/admin/testoutgoingmailconf.php
@@ -52,7 +52,7 @@
     // Manage Moodle debugging options.
     $debuglevel = $CFG->debug;
     $debugdisplay = $CFG->debugdisplay;
-    $debugsmtp = $CFG->debugsmtp;
+    $debugsmtp = $CFG->debugsmtp ?? null; // This might not be set as it's optional.
     $CFG->debugdisplay = true;
     $CFG->debugsmtp = true;
     $CFG->debug = 15;
@@ -66,7 +66,12 @@
     // Restore Moodle debugging options.
     $CFG->debug = $debuglevel;
     $CFG->debugdisplay = $debugdisplay;
-    $CFG->debugsmtp = $debugsmtp;
+
+    // Restore the debugsmtp config, if it was set originally.
+    unset($CFG->debugsmtp);
+    if (!is_null($debugsmtp)) {
+        $CFG->debugsmtp = $debugsmtp;
+    }
 
     if ($success) {
         $msgparams = new stdClass();