// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
@@ -0,0 +1,14 @@
+SET NAMES 'utf8';
+
+INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
+('PS_RESTRICT_DELIVERED_COUNTRIES', '0', NOW(), NOW());
+
+UPDATE `PREFIX_country_lang`
+SET `name` = 'United States'
+WHERE `name` = 'United State'
+AND `id_lang` = (
+	SELECT `id_lang`
+	FROM `PREFIX_lang`
+	WHERE `iso_code` = 'en'
+	LIMIT 1
+);