Duplicate upgrade step for 5.7.beta1 in 5.8.alpha1 to capture anyone who has already...

diff --git a/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl
index 595b125c3b17519c4508c1c7d89037a2ec4157bc..84055828bdc81fd44852023c959f662d7b928424 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl
@@ -1 +1,16 @@
 {* file to handle db changes in 5.8.alpha1 during upgrade *}
+
+{* Duplicate changes made in 5.7.beta1 to icons to ensure anyone who had already upgraded to RC gets the updated icons *}
+UPDATE civicrm_navigation SET name = "Search" WHERE name = "Search..." AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-search" WHERE name = "Search" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-address-book-o" WHERE name = "Contacts" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-credit-card" WHERE name = "Contributions" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-calendar" WHERE name = "Events" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-envelope-o" WHERE name = "Mailings" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-id-badge" WHERE name = "Memberships" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-bullhorn" WHERE name = "Campaigns" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-folder-open-o" WHERE name = "Cases" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-money" WHERE name = "Grants" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-gears" WHERE name = "Administer" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-bar-chart" WHERE name = "Reports" AND domain_id = {$domainID};
+UPDATE civicrm_navigation SET icon = "crm-i fa-life-ring" WHERE name = "Support" AND domain_id = {$domainID};