Going back to old method, as the new one seems to have problems on some

platforms.

diff --git a/config-dist.php b/config-dist.php
index bb2a221ecf795271b29767cb630db484074b171e..84fdf6f884b3752139cd6ab1b2979d3df5daa26a 100644 (file)
--- a/config-dist.php
+++ b/config-dist.php
@@ -121,15 +121,10 @@ $CFG->admin = 'admin';
 \r
 \r
 //=========================================================================\r
-// ALL DONE!  To continue your setup, visit your Moodle web page.\r
+// ALL DONE!  To continue your setup, visit your Moodle page with a browser\r
 //=========================================================================\r
 \r
-if (! @include_once("$CFG->dirroot/lib/setup.php"))  {    // Do not change this\r
-    echo "<p>Error detected in config.php</p>";\r
-    echo "<p>Error in: \$CFG->dirroot = '$CFG->dirroot';</p>";\r
-    echo "<p>Try this: \$CFG->dirroot = '".dirname(__FILE__)."';";\r
-    die;\r
-}\r
+require_once("$CFG->dirroot/lib/setup.php");    // Do not change this\r
 \r
 // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, \r
 // RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.\r