From 80ca466e1349ab755f95c9e14a633b8534239f75 Mon Sep 17 00:00:00 2001 From: gCharmes Date: Sun, 12 Aug 2012 19:17:04 +0000 Subject: [PATCH] [-] CLASSES : Report Contry::getCountries() changes from 1.4 to 1.5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16817 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Country.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Country.php b/classes/Country.php index 91197de11..d54a689d7 100644 --- a/classes/Country.php +++ b/classes/Country.php @@ -131,7 +131,7 @@ class CountryCore extends ObjectModel $countries[$country['id_country']] = $country; if ($list_states) - foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'state` ORDER BY s.`name` ASC') as $state) + foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'state` ORDER BY `name` ASC') as $state) if (isset($countries[$state['id_country']])) /* Does not keep the state if its country has been disabled and not selected */ $countries[$state['id_country']]['states'][] = $state;