From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 29 Oct 2018 22:39:18 +0000 (+1100)
Subject: Duplicate upgrade step for 5.7.beta1 in 5.8.alpha1 to capture anyone who has already... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00161124a750dcf97d4781446ac43e8eba6a9b8d;p=civicrm-core.git

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

diff --git a/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.8.alpha1.mysql.tpl
index 595b125c3b..84055828bd 100644
--- 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};