Merge pull request #22995 from totten/5.47-postupgrade

 #3119 - Post-upgrade messages no longer being displayed

CRM/Upgrade/Form.php

@@ -815,8 +815,9 @@ SET    version = '$version'
     $config = CRM_Core_Config::singleton();
     $config->userSystem->flush();
 
-    CRM_Core_Invoke::rebuildMenuAndCaches(FALSE, TRUE);
+    CRM_Core_Invoke::rebuildMenuAndCaches(FALSE, FALSE);
     // NOTE: triggerRebuild is FALSE becaues it will run again in a moment (via fixSchemaDifferences).
+    // sessionReset is FALSE because upgrade status/postUpgradeMessages are needed by the Page. We reset later in doFinish().
 
     $versionCheck = new CRM_Utils_VersionCheck();
     $versionCheck->flushCache();
@@ -840,6 +841,8 @@ SET    version = '$version'
    * @return bool
    */
   public static function doFinish(): bool {
+    $session = CRM_Core_Session::singleton();
+    $session->reset(2);
     return TRUE;
   }
 

CRM/Upgrade/Incremental/Base.php

@@ -195,7 +195,9 @@ class CRM_Upgrade_Incremental_Base {
     // Note: A good test-scenario is to install 5.45; enable logging and CiviGrant; disable searchkit+afform; then upgrade to 5.47.
     $schema = new CRM_Logging_Schema();
     $schema->fixSchemaDifferences();
-    CRM_Core_Invoke::rebuildMenuAndCaches(FALSE, TRUE);
+
+    CRM_Core_Invoke::rebuildMenuAndCaches(FALSE, FALSE);
+    // sessionReset is FALSE because upgrade status/postUpgradeMessages are needed by the page. We reset later in doFinish().
 
     return TRUE;
   }