// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script

2011-08-02 09:54:23 +00:00
parent 66eab15a18
commit 3c8c85b1cd
46 changed files with 370 additions and 357 deletions
@@ -138,7 +138,7 @@ class CountryCore extends ObjectModel
 				LEFT JOIN `'._DB_PREFIX_.'zone` z ON z.`id_zone` = c.`id_zone`
 				WHERE 1'
 					.($active ? ' AND c.active = 1' : '')
-					.(!is_null($containStates) ? 'AND c.`contains_states` = '.(int)($containStates) : '').'
+					.(!is_null($containStates) ? ' AND c.`contains_states` = '.(int)($containStates) : '').'
 		ORDER BY cl.name ASC';
 		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
 		$countries = array();