MDL-20695 can not use trigger_error() for informing users about problems in config...

diff --git a/lib/setup.php b/lib/setup.php
index 18eb6c28e276faddd922cde6c819eca0a168231b..7ec63887c53d09502ad8c22e09cde1eb9631fb73 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -168,11 +168,11 @@ if (!defined('NO_DEBUG_DISPLAY')) {
     define('NO_DEBUG_DISPLAY', false);
 }
 
-/// wwwroot is mandatory
-    if (!isset($CFG->wwwroot)) {
-        trigger_error('Fatal: $CFG->wwwroot is not configured! Exiting.');
-        die;
-    }
+// wwwroot is mandatory
+if (!isset($CFG->wwwroot)) {
+    // trigger_error() is not correct here, no need to log this
+    die('Fatal: $CFG->wwwroot is not configured! Exiting.');
+}
 
 /// Detect CLI scripts - CLI scripts are executed from command line, do not have session and we do not want HTML in output
     if (!defined('CLI_SCRIPT')) { // CLI_SCRIPT might be defined in 'fake' CLI scripts like admin/cron.php