From: Micah Nordland <micah@rehack.me>
Date: Thu, 2 Jun 2016 15:25:50 +0000 (-0400)
Subject: CRM-18699 fix in 4.7.9 now, better where statment
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2be20a47103bde4a4049a3fe9f433bcd4c4fe41a;p=civicrm-core.git

CRM-18699 fix in 4.7.9 now, better where statment
---

diff --git a/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
index 47d7120047..6fc87f8fc0 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
@@ -13,5 +13,3 @@ DELETE FROM civicrm_state_province WHERE name = 'Fernando de Noronha';
 -- CRM-17118 extend civicrm_address postal_code to accept full data strings from paypal etc.
 ALTER TABLE civicrm_address CHANGE `postal_code` `postal_code` varchar(64) ;
 
--- CRM-18699 Fix Wake Island misspelling, was Wake Ialand
-UPDATE civicrm_state_province SET name="Wake Island" WHERE id=4981;
diff --git a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
index 5d38563929..925db61223 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
@@ -6,3 +6,6 @@ UPDATE civicrm_option_value SET
   {localize field="label"}label = '{ts escape="sql"}Print/Merge Document{/ts}'{/localize},
   {localize field="description"}description = '{ts escape="sql"}Export letters and other printable documents.{/ts}'{/localize}
 WHERE name = 'Print PDF Letter' AND option_group_id = @option_group_id_act;
+
+-- CRM-18699 Fix Wake Island misspelling, was Wake Ialand
+UPDATE civicrm_state_province SET name="Wake Island" WHERE name="Wake Ialand";