MDL-8384 debugdisplay does not respect original value of display_errors

diff --git a/lib/adminlib.php b/lib/adminlib.php
index cc62831788208d2f6186b475f7efc8d857fa6003..4f94c005a39bdfbbe1c6bd4218821d452a69d6bd 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2579,7 +2579,8 @@ class admin_setting_special_debugdisplay extends admin_setting_configcheckbox {
         $name = 'debugdisplay';
         $visiblename = get_string('debugdisplay', 'admin');
         $description = get_string('configdebugdisplay', 'admin');
-        parent::admin_setting_configcheckbox($name, $visiblename, $description, '');
+        $default = ini_get('display_errors');
+        parent::admin_setting_configcheckbox($name, $visiblename, $description, $default);
     }
 
     function write_setting($data) {
@@ -2594,7 +2595,7 @@ class admin_setting_special_debugdisplay extends admin_setting_configcheckbox {
     function output_html() {
 
         if ($this->get_setting() === NULL) {
-            $currentsetting = ini_get('display_error');
+            $currentsetting = $this->defaultsetting;
         } else {
             $currentsetting = $this->get_setting();
         }

diff --git a/lib/setup.php b/lib/setup.php
index 28b0020ad525925f38de76c57df08716fba6a392..e4e36dcd4780ee91957bed16df57fb11cb5166eb 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -258,7 +258,9 @@ global $HTTPSPAGEREQUIRED;
 
 
 /// If we want to display Moodle errors, then try and set PHP errors to match
-    if (empty($CFG->debugdisplay)) {
+    if (!isset($CFG->debugdisplay)) {
+        //keep it as is during installation
+    } else if (empty($CFG->debugdisplay)) {
         @ini_set('display_errors', '0');
         @ini_set('log_errors', '1');
     } else {