From 218194ab2ba12f648b77760c6dcc608043e89fa7 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 7 Jan 2015 13:22:59 -0800 Subject: [PATCH] xml/templates/civicrm_state_province.tpl - Fix crash in web-based installation The web-based installer bombs when it encounters inlined comments. --- xml/templates/civicrm_state_province.tpl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl index 39beca3c08..50e38b5978 100644 --- a/xml/templates/civicrm_state_province.tpl +++ b/xml/templates/civicrm_state_province.tpl @@ -1538,17 +1538,17 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (3053, 1099, "TB", "Tatabánya"), (3054, 1099, "ZE", "Zalaegerszeg"), (3055, 1102, "BA", "Bali"), -(3056, 1102, "BB", "Kepulauan Bangka Belitung"), -- changed from "Bangka Belitung" +(3056, 1102, "BB", "Kepulauan Bangka Belitung"), (3057, 1102, "BT", "Banten"), (3058, 1102, "BE", "Bengkulu"), (3059, 1102, "GO", "Gorontalo"), -(3060, 1102, "PB", "Papua Barat"), -- changed from "IJ" and "Irian Jaya" +(3060, 1102, "PB", "Papua Barat"), (3061, 1102, "JA", "Jambi"), (3062, 1102, "JB", "Jawa Barat"), (3063, 1102, "JT", "Jawa Tengah"), (3064, 1102, "JI", "Jawa Timur"), (3065, 1102, "KB", "Kalimantan Barat"), -(3066, 1102, "KI", "Kalimantan Timur"), -- updated abbreviation +(3066, 1102, "KI", "Kalimantan Timur"), (3067, 1102, "KS", "Kalimantan Selatan"), (3068, 1102, "KR", "Kepulauan Riau"), (3069, 1102, "LA", "Lampung"), @@ -1565,9 +1565,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (3080, 1102, "SB", "Sumatra Barat"), (3081, 1102, "SS", "Sumatra Selatan"), (3082, 1102, "SU", "Sumatera Utara"), -(3083, 1102, "JK", "DKI Jakarta"), -- changed from "Jakarta Raya" +(3083, 1102, "JK", "DKI Jakarta"), (3084, 1102, "AC", "Aceh"), -(3085, 1102, "YO", "DI Yogyakarta"), -- changed from "Yogyakarta" +(3085, 1102, "YO", "DI Yogyakarta"), (3086, 1105, "C", "Cork"), (3087, 1105, "CE", "Clare"), (3088, 1105, "CN", "Cavan"), @@ -3670,9 +3670,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (5215, 1165, "_O", "Khan Yunis"), (5216, 1165, "_P", "Rafah"), -(5217, 1020, "BRU", "Brussels"), -- missing Belgian province (CRM-3609) +(5217, 1020, "BRU", "Brussels"), -(5218, 1140, "DIF", "Distrito Federal"), -- missing Mexican province (CRM-4534) +(5218, 1140, "DIF", "Distrito Federal"), (5219, 1208, "TXG", "Taichung City"), (5220, 1208, "KHH", "Kaohsiung City"), (5221, 1208, "TPE", "Taipei City"), @@ -3914,6 +3914,6 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (NULL, 1169, "AMA", "Amazonas"), -- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat, Kalimantan Utara) and revised outdated names in code above -(NULL, 1102, "KT", "Kalimantan Tengah"), -- added, updated abbreviation -(NULL, 1102, "SR", "Sulawesi Barat"), -- added, updated abbreviation -(NULL, 1102, "KU", "Kalimantan Utara"); -- added \ No newline at end of file +(NULL, 1102, "KT", "Kalimantan Tengah"), +(NULL, 1102, "SR", "Sulawesi Barat"), +(NULL, 1102, "KU", "Kalimantan Utara"); \ No newline at end of file -- 2.25.1