From 04d61878586e890a10897de4196c2bb019179d55 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 1 Jun 2018 09:45:59 +1200
Subject: [PATCH] Move upgrade message to right file

---
 CRM/Upgrade/Incremental/php/FiveThree.php | 8 ++++++++
 CRM/Upgrade/Incremental/php/FiveTwo.php   | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FiveThree.php b/CRM/Upgrade/Incremental/php/FiveThree.php
index 95a737919c..8f022e0699 100644
--- a/CRM/Upgrade/Incremental/php/FiveThree.php
+++ b/CRM/Upgrade/Incremental/php/FiveThree.php
@@ -40,6 +40,14 @@ class CRM_Upgrade_Incremental_php_FiveThree extends CRM_Upgrade_Incremental_Base
    * @param null $currentVer
    */
   public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
+    if ($rev == '5.3.0') {
+      $params = array(
+        1 => 'edit user-driven message templates',
+        2 => 'edit system workflow message templates',
+        3 => 'edit message templates',
+      );
+      $preUpgradeMessage .= '<p>' . ts('New granular permissions called %1 and %2 have been added for %3 permission. These permissions help to limit user access per template', $params) . '</p>';
+    }
     // Example: Generate a pre-upgrade message.
     // if ($rev == '5.12.34') {
     //   $preUpgradeMessage .= '<p>' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', array(1 => 'manage tags')) . '</p>';
diff --git a/CRM/Upgrade/Incremental/php/FiveTwo.php b/CRM/Upgrade/Incremental/php/FiveTwo.php
index f8f2c8bd9a..1daa56ad46 100644
--- a/CRM/Upgrade/Incremental/php/FiveTwo.php
+++ b/CRM/Upgrade/Incremental/php/FiveTwo.php
@@ -40,14 +40,6 @@ class CRM_Upgrade_Incremental_php_FiveTwo extends CRM_Upgrade_Incremental_Base {
    * @param null $currentVer
    */
   public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
-    if ($rev == '5.3.0') {
-      $params = array(
-        1 => 'edit user-driven message templates',
-        2 => 'edit system workflow message templates',
-        3 => 'edit message templates',
-      );
-      $preUpgradeMessage .= '<p>' . ts('New granular permissions called %1 and %2 have been added for %3 permission. These permissions help to limit user access per template', $params) . '</p>';
-    }
   }
 
   /**
-- 
2.25.1