Fix bad menu name

diff --git a/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl
index 7ee869f2787a5ce7caed767b752dd634a1b41fe5..775ac3e8759c765a411885535fc1ff40137b044e 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl
@@ -1,6 +1,7 @@
 {* file to handle db changes in 5.7.alpha1 during upgrade *}
 
-UPDATE civicrm_navigation SET icon = "crm-i fa-search" WHERE name = "Search..." AND domain_id = {$domainID} AND icon IS NULL;
+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} AND icon IS NULL;
 UPDATE civicrm_navigation SET icon = "crm-i fa-address-book-o" WHERE name = "Contacts" AND domain_id = {$domainID} AND icon IS NULL;
 UPDATE civicrm_navigation SET icon = "crm-i fa-money" WHERE name = "Contributions" AND domain_id = {$domainID} AND icon IS NULL;
 UPDATE civicrm_navigation SET icon = "crm-i fa-calendar" WHERE name = "Events" AND domain_id = {$domainID} AND icon IS NULL;

diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl
index 22e63e3c62034c4a3bfb3704ee4c49fde3ee4287..cfe70d099efe5b3dbb0a06b0372a3bf6ee95a5b3 100644 (file)
--- a/xml/templates/civicrm_navigation.tpl
+++ b/xml/templates/civicrm_navigation.tpl
@@ -62,7 +62,7 @@ VALUES
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight, icon )
 VALUES
-    (  @domainID, NULL, '{ts escape="sql" skip="true"}Search{/ts}',  'Search...',    NULL, '',  NULL, '1', NULL, 10, 'crm-i fa-search' );
+    (  @domainID, NULL, '{ts escape="sql" skip="true"}Search{/ts}',  'Search',    NULL, '',  NULL, '1', NULL, 10, 'crm-i fa-search' );
 
 SET @searchlastID:=LAST_INSERT_ID();