mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Turn off strict XML headers during upgrade, so if an error occurrs, you are more likely to be able to see what happened.
This commit is contained in:
parent
4906997bbb
commit
fa7bec7bef
@ -224,6 +224,7 @@
|
|||||||
$origdebug = $CFG->debug;
|
$origdebug = $CFG->debug;
|
||||||
$CFG->debug = DEBUG_MINIMAL;
|
$CFG->debug = DEBUG_MINIMAL;
|
||||||
error_reporting($CFG->debug);
|
error_reporting($CFG->debug);
|
||||||
|
$CFG->xmlstrictheaders = false;
|
||||||
|
|
||||||
// logo ut in case we are upgrading from pre 1.9 version in order to prevent
|
// logo ut in case we are upgrading from pre 1.9 version in order to prevent
|
||||||
// weird session/role problems caused by incorrect data in USER and SESSION
|
// weird session/role problems caused by incorrect data in USER and SESSION
|
||||||
@ -333,7 +334,7 @@
|
|||||||
|
|
||||||
// Update core message providers
|
// Update core message providers
|
||||||
message_update_providers();
|
message_update_providers();
|
||||||
message_update_providers('message');
|
message_update_providers('message');
|
||||||
|
|
||||||
if (set_config("version", $version)) {
|
if (set_config("version", $version)) {
|
||||||
remove_dir($CFG->dataroot . '/cache', true); // flush cache
|
remove_dir($CFG->dataroot . '/cache', true); // flush cache
|
||||||
@ -367,6 +368,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Turn off xmlstrictheaders during upgrade.
|
||||||
|
$origxmlstrictheaders = !empty($CFG->xmlstrictheaders);
|
||||||
|
$CFG->xmlstrictheaders = false;
|
||||||
|
|
||||||
/// Find and check all main modules and load them up or upgrade them if necessary
|
/// Find and check all main modules and load them up or upgrade them if necessary
|
||||||
/// first old *.php update and then the new upgrade.php script
|
/// first old *.php update and then the new upgrade.php script
|
||||||
upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php"); // Return here afterwards
|
upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php"); // Return here afterwards
|
||||||
@ -436,6 +441,9 @@
|
|||||||
|
|
||||||
unset($SESSION->installautopilot);
|
unset($SESSION->installautopilot);
|
||||||
|
|
||||||
|
// Turn xmlstrictheaders back on now.
|
||||||
|
$CFG->xmlstrictheaders = $origxmlstrictheaders;
|
||||||
|
|
||||||
/// Set up the blank site - to be customized later at the end of install.
|
/// Set up the blank site - to be customized later at the end of install.
|
||||||
if (! $site = get_site()) {
|
if (! $site = get_site()) {
|
||||||
// We are about to create the site "course"
|
// We are about to create the site "course"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user