moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'w15_MDL-44882_m26_upgrademaint' of https://github.com/skodak/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2014-04-07 15:43:15 +12:00
commit 333d189d9f
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
admin/index.php
View file

@ -241,6 +241,13 @@ if (!core_tables_exist()) {
// Check version of Moodle code on disk compared with database // Check version of Moodle code on disk compared with database
// and upgrade if possible. // and upgrade if possible.
if (!$cache) {
// Do not try to do anything fancy in non-cached mode,
// this prevents themes from fetching data from non-existent tables.
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
}
$stradministration = get_string('administration'); $stradministration = get_string('administration');
$PAGE->set_context(context_system::instance()); $PAGE->set_context(context_system::instance());
@ -271,9 +278,6 @@ if (!$cache and $version > $CFG->version) { // upgrade
// We then purge the regular caches. // We then purge the regular caches.
purge_all_caches(); purge_all_caches();
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
/** @var core_admin_renderer $output */ /** @var core_admin_renderer $output */
$output = $PAGE->get_renderer('core', 'admin'); $output = $PAGE->get_renderer('core', 'admin');
@ -351,8 +355,6 @@ if (!$cache and $version > $CFG->version) { // upgrade
// Always verify plugin dependencies! // Always verify plugin dependencies!
$failed = array(); $failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) { if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
$reloadurl = new moodle_url('/admin/index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1, 'cache' => 0)); $reloadurl = new moodle_url('/admin/index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1, 'cache' => 0));
echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl); echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
die(); die();
@ -386,8 +388,6 @@ if (!$cache and moodle_needs_upgrading()) {
if (!$confirmplugins) { if (!$confirmplugins) {
$strplugincheck = get_string('plugincheck'); $strplugincheck = get_string('plugincheck');
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
$PAGE->navbar->add($strplugincheck); $PAGE->navbar->add($strplugincheck);
$PAGE->set_title($strplugincheck); $PAGE->set_title($strplugincheck);
$PAGE->set_heading($strplugincheck); $PAGE->set_heading($strplugincheck);
@ -425,8 +425,6 @@ if (!$cache and moodle_needs_upgrading()) {
// Make sure plugin dependencies are always checked. // Make sure plugin dependencies are always checked.
$failed = array(); $failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) { if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
$reloadurl = new moodle_url('/admin/index.php', array('cache' => 0)); $reloadurl = new moodle_url('/admin/index.php', array('cache' => 0));
echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl); echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
die(); die();