CRM-19616 Fix urls for Manage Tag and New Tag wrongly set in 4.7.13

diff --git a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
index 0dca1523bb22e2f94a90953b7541f825b852e4d9..dca3640814488e0e02cb4865e20a2b8623d6fcee 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
@@ -7,17 +7,17 @@ ALTER TABLE  `civicrm_line_item` CHANGE  `deductible_amount`  `non_deductible_am
 
 -- CRM-15371 Manage tags with new *manage tags* permission (used to need *administer CiviCRM* permission)
 UPDATE civicrm_navigation SET
-  `url` = 'civicrm/tag?reset=1&action=add',
+  `url` = 'civicrm/tag?reset=1',
   `permission` = 'manage tags'
 WHERE `name` = 'Manage Tags (Categories)';
 
 UPDATE civicrm_navigation SET
-  `url` = 'civicrm/admin/tag?reset=1',
+  `url` = 'civicrm/tag?reset=1&action=add',
   `permission` = 'manage tags'
 WHERE `name` = 'New Tag';
 
 UPDATE civicrm_navigation SET
-  `url` = 'civicrm/admin/tag?reset=1'
+  `url` = 'civicrm/tag?reset=1'
 WHERE `name` = 'Tags (Categories)';
 
 -- CRM-16352: Add language filter support for mass mailing

diff --git a/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl
index d8918fdfc5115b0a89195f66f161f3e9972927fc..aff1e606af6537b677f0548ff9cb30b7d7c14f53 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl
@@ -1 +1,16 @@
 {* file to handle db changes in 4.7.14 during upgrade *}
+-- CRM-19616 Fix Manage Tags and New Tag Url issues.
+UPDATE civicrm_navigation SET
+  `url` = 'civicrm/tag?reset=1'
+WHERE `name` = 'Manage Tags (Categories)'
+AND `url` = 'civicrm/tag?reset=1&action=add';
+
+UPDATE civicrm_navigation SET
+  `url` = 'civicrm/tag?reset=1&action=add'
+WHERE `name` = 'New Tag'
+AND `url` = 'civicrm/admin/tag?reset=1';
+
+UPDATE civicrm_navigation SET
+  `url` = 'civicrm/tag?reset=1'
+WHERE `name` = 'Tags (Categories)'
+AND `url` = 'civicrm/admin/tag?reset=1';