From: Tim Otten <totten@civicrm.org>
Date: Wed, 15 Aug 2018 21:09:04 +0000 (-0700)
Subject: Upgrade messages - When going through 5.4.*, only display permission message once
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8e8d40584970e55751db7241eaeeb61ba230a04d;p=civicrm-core.git

Upgrade messages - When going through 5.4.*, only display permission message once
---

diff --git a/CRM/Upgrade/Incremental/php/FiveFour.php b/CRM/Upgrade/Incremental/php/FiveFour.php
index 9c4082c0d7..38e01f89d2 100644
--- a/CRM/Upgrade/Incremental/php/FiveFour.php
+++ b/CRM/Upgrade/Incremental/php/FiveFour.php
@@ -55,7 +55,9 @@ class CRM_Upgrade_Incremental_php_FiveFour extends CRM_Upgrade_Incremental_Base
    *   an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
    */
   public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
-    $postUpgradeMessage .= '<p>' . ts('A new %1 permission has been added. It is not granted by default. If your users create reports, you may wish to review your permissions.', array(1 => 'save Report Criteria')) . '</p>';
+    if ($rev == '5.4.alpha1') {
+      $postUpgradeMessage .= '<p>' . ts('A new %1 permission has been added. It is not granted by default. If your users create reports, you may wish to review your permissions.', array(1 => 'save Report Criteria')) . '</p>';
+    }
     // Example: Generate a post-upgrade message.
     // if ($rev == '5.12.34') {
     //   $postUpgradeMessage .= '<br /><br />' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'.");