From 439925318ff1855a620c15eefc50fea1c25de6cb Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 28 Apr 2013 21:44:44 -0700 Subject: [PATCH] CRM-12371 - Don't show errors if admin refreshes post-upgrade screen. Note: It's not possible to display the exact same messages because the session is destroyed as part of the upgrade process. ---------------------------------------- * CRM-12371: Refreshing upgrade finish page causes errors http://issues.civicrm.org/jira/browse/CRM-12371 --- CRM/Upgrade/Page/Upgrade.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index eda5397893..bdac170084 100644 --- a/CRM/Upgrade/Page/Upgrade.php +++ b/CRM/Upgrade/Page/Upgrade.php @@ -174,11 +174,16 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { $upgrade = new CRM_Upgrade_Form(); $template = CRM_Core_Smarty::singleton(); - // TODO: Use structured message store - $postUpgradeMessage = file_get_contents($this->get('postUpgradeMessageFile')); + list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + if ($currentVer != $latestVer) { + // TODO: Use structured message store + $postUpgradeMessage = file_get_contents($this->get('postUpgradeMessageFile')); - // This destroys $session, so do it after ge('postUpgradeMessageFile') - CRM_Upgrade_Form::doFinish(); + // This destroys $session, so do it after get('postUpgradeMessageFile') + CRM_Upgrade_Form::doFinish(); + } else { + $postUpgradeMessage = ''; // Session was destroyed! Can't recover messages. + } // do a version check - after doFinish() sets the final version list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); -- 2.25.1