fixed several bogus errors and warnings during installation and upgrades, forced logout when upgrading from 1.6

This commit is contained in:
skodak
2006-09-10 21:10:48 +00:00
parent 2ebd596764
commit aa893d6b76
2 changed files with 48 additions and 5 deletions
+28 -5
View File
@@ -192,6 +192,14 @@ global $HTTPSPAGEREQUIRED;
raise_memory_limit('64M'); // We should never NEED this much but just in case...
/// Disable errors for now - needed for installation when debug enabled in config.php
if (isset($CFG->debug)) {
$originalconfigdebug = $CFG->debug;
unset($CFG->debug);
} else {
$originalconfigdebug = -1;
}
/// If $CFG->unicodedb is not set, get it from database or calculate it because we need
/// to know it to "set names" properly.
/// (this is the only database interaction before "set names")
@@ -220,12 +228,13 @@ global $HTTPSPAGEREQUIRED;
$db->LogSQL();
}
/// Set error reporting back to normal
if (!isset($CFG->debug)) { // empty() would override 0 or false from config.php
$CFG->debug = 5;
/// Prevent warnings from roles when upgrading with debug on
if (isset($CFG->debug)) {
$originaldatabasedebug = $CFG->debug;
unset($CFG->debug);
} else {
$originaldatabasedebug = -1;
}
error_reporting($CFG->debug);
//// Defining the site
@@ -247,6 +256,20 @@ global $HTTPSPAGEREQUIRED;
}
/// Set error reporting back to normal
if ($originaldatabasedebug == -1) {
$CFG->debug = 5;
} else {
$CFG->debug = $originaldatabasedebug;
}
if ($originalconfigdebug !== -1) {
$CFG->debug = $originalconfigdebug;
}
unset($originalconfigdebug);
unset($originaldatabasedebug);
error_reporting($CFG->debug);
/// Set a default enrolment configuration (see bug 1598)
if (!isset($CFG->enrol)) {
$CFG->enrol = 'manual';