Slightly different way of doing this to avoid problems with error_reporting

not working.

diff --git a/config-dist.php b/config-dist.php
index e8c129ef52da2eef25983c1dc99e839bdc68f8e2..70081967f92c50bdbdd555196ca7b53b16a18831 100644 (file)
--- a/config-dist.php
+++ b/config-dist.php
@@ -124,7 +124,9 @@ $CFG->admin = 'admin';
 // ALL DONE!  To continue installation, visit your main page with a browser\r
 //=========================================================================\r
 \r
-if (! @include_once("$CFG->dirroot/lib/setup.php"))  {       // Do not edit\r
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {       // Do not edit\r
+    include_once("$CFG->dirroot/lib/setup.php");\r
+} else {\r
     if ($CFG->dirroot == dirname(__FILE__)) {\r
         echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";\r
         echo "<p>Are you sure all your files have been uploaded?</p>";\r
@@ -136,6 +138,7 @@ if (! @include_once("$CFG->dirroot/lib/setup.php"))  {       // Do not edit
     die;\r
 }\r
 \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
 ?>\r