From 777ff93382b48fad59f310a4baa8ed5ef35cecb5 Mon Sep 17 00:00:00 2001 From: Matt Porritt Date: Wed, 3 Jan 2024 11:22:22 +1100 Subject: [PATCH] MDL-80509 Site Registration: Prompt to register site after all upgrades Unregistered sites will now display registration form to admins after every upgrade, including plugin upgrades. Registration form will not show for sites that are not set to public. --- lib/upgradelib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/upgradelib.php b/lib/upgradelib.php index 355a234ccfe..37e3ee3bbc5 100644 --- a/lib/upgradelib.php +++ b/lib/upgradelib.php @@ -1947,9 +1947,6 @@ function upgrade_core($version, $verbose) { $syscontext->mark_dirty(); core_upgrade_time::record_detail('context_system::mark_dirty'); - // Prompt admin to register site. Reminder flow handles sites already registered, so admin won't be prompted if registered. - set_config('registrationpending', true); - print_upgrade_part_end('moodle', false, $verbose); } catch (Exception $ex) { upgrade_handle_exception($ex); @@ -2002,6 +1999,10 @@ function upgrade_noncore($verbose) { set_config('allcomponenthash', core_component::get_all_component_hash()); core_upgrade_time::record_detail('core_component::get_all_component_hash'); + // Prompt admin to register site. Reminder flow handles sites already registered, so admin won't be prompted if registered. + // Defining for non-core upgrades also covers core upgrades. + set_config('registrationpending', true); + // Purge caches again, just to be sure we arn't holding onto old stuff now. if (!defined('CLI_UPGRADE_RUNNING') || !CLI_UPGRADE_RUNNING) { cache_helper::purge_all(true);