diff --git a/admin/index.php b/admin/index.php index d3ec395e574..ed33c006014 100644 --- a/admin/index.php +++ b/admin/index.php @@ -261,6 +261,18 @@ if ($version > $CFG->version) { // upgrade } $output = $PAGE->get_renderer('core', 'admin'); + + $deployer = available_update_deployer::instance(); + if ($deployer->enabled()) { + $deployer->initialize($reloadurl, $reloadurl); + + $deploydata = $deployer->submitted_data(); + if (!empty($deploydata)) { + echo $output->upgrade_plugin_confirm_deploy_page($deployer, $deploydata); + die(); + } + } + echo $output->upgrade_plugin_check_page(plugin_manager::instance(), available_update_checker::instance(), $version, $showallplugins, $reloadurl, new moodle_url('/admin/index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1))); diff --git a/admin/plugins.php b/admin/plugins.php index 7b59cb19f1e..4a99a296e5a 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -51,4 +51,17 @@ if ($fetchremote) { } $output = $PAGE->get_renderer('core', 'admin'); + +$deployer = available_update_deployer::instance(); +if ($deployer->enabled()) { + $myurl = new moodle_url($PAGE->url, array('updatesonly' => $updatesonly, 'contribonly' => $contribonly)); + $deployer->initialize($myurl, $myurl); + + $deploydata = $deployer->submitted_data(); + if (!empty($deploydata)) { + echo $output->upgrade_plugin_confirm_deploy_page($deployer, $deploydata); + die(); + } +} + echo $output->plugin_management_page($pluginman, $checker, $options);