[NFC] Move Upgrade for navgation from 5.34.alpha1 to 5.35.alpha1 as the 5.34 RC has...

diff --git a/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
index 118ee6797a4b6073262a07ffa80020b0de5c33fa..3bf32eb8bd46eb3c279fc8c5a27266c2b53c95e3 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
@@ -9,9 +9,3 @@ INSERT IGNORE INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`,
 DELETE FROM civicrm_mapping_field
 WHERE name NOT IN ( SELECT concat('custom_', id) FROM civicrm_custom_field)
 AND name LIKE 'custom_%';
-
--- Update permissions for CiviCRM Admin Menu -> CiviMail -> Message Templates
-UPDATE civicrm_navigation n
-SET n.permission = 'edit user-driven message templates,edit message templates,edit system workflow message templates', n.permission_operator = 'OR'
-WHERE n.name = 'Message Templates'
-AND n.permission = 'edit message templates';

diff --git a/CRM/Upgrade/Incremental/sql/5.35.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.35.alpha1.mysql.tpl
index 72aec9990b49a52b1bad53cba74621b407343ced..d9d06976824cbe03a6f50ad4ec03ffbe370846cf 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/5.35.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.35.alpha1.mysql.tpl
@@ -1 +1,7 @@
 {* file to handle db changes in 5.35.alpha1 during upgrade *}
+
+-- Update permissions for CiviCRM Admin Menu -> CiviMail -> Message Templates
+UPDATE civicrm_navigation n
+SET n.permission = 'edit user-driven message templates,edit message templates,edit system workflow message templates', n.permission_operator = 'OR'
+WHERE n.name = 'Message Templates'
+AND n.permission = 'edit message templates';