From efea3f50f7fd00db1da37ab1aa548143a1120e88 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 21 Mar 2022 15:04:08 -0700
Subject: [PATCH] CRM_Upgrade_Form::doFinish() - Narrower call to session-reset

The main call(s) to `rebuildMenuAndCaches()` do clear out most caches.  It's
_just_ the session that has been skipped.
---
 CRM/Upgrade/Form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
index 903ea66d15..a0af05b0b0 100644
--- a/CRM/Upgrade/Form.php
+++ b/CRM/Upgrade/Form.php
@@ -841,7 +841,8 @@ SET    version = '$version'
    * @return bool
    */
   public static function doFinish(): bool {
-    CRM_Core_Config::singleton()->cleanupCaches(TRUE);
+    $session = CRM_Core_Session::singleton();
+    $session->reset(2);
     return TRUE;
   }
 
-- 
2.25.1