CRM-15220 - Fix malformed url in grant menu

diff --git a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl
index efab89be71fc2694e342d03aa5d277c28fa319f7..f102e22f6c226ca5d72689b8cee5f29b0ee68699 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl
@@ -5,3 +5,6 @@ UPDATE `civicrm_dashboard` SET `permission` = 'access my cases and activities,ac
 
 -- CRM-15218
 UPDATE `civicrm_uf_group` SET name = LOWER(name) WHERE name IN ("New_Individual", "New_Organization", "New_Household");
+
+-- CRM-15220
+UPDATE `civicrm_navigation` SET url = 'civicrm/admin/options/grant_type?reset=1' WHERE url = 'civicrm/admin/options/grant_type&reset=1';

diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl
index d3889e403292056fb0c95050a721401c906bcd0a..4e542d453567544d10e0e677db5f9a8ad999d080 100644 (file)
--- a/xml/templates/civicrm_navigation.tpl
+++ b/xml/templates/civicrm_navigation.tpl
@@ -549,7 +549,7 @@ SET @adminGrantlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/admin/options/grant_type&reset=1', '{ts escape="sql" skip="true"}Grant Types{/ts}', 'Grant Types', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 1 );
+    ( @domainID, 'civicrm/admin/options/grant_type?reset=1', '{ts escape="sql" skip="true"}Grant Types{/ts}', 'Grant Types', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 1 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )