// Merge -> 10309

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
@@ -135,7 +135,8 @@ class AddressCore extends ObjectModel
 		/* Get and cache address country name */
 		if ($this->id)
 		{
-			$result = Db::getInstance()->getRow('SELECT `name` FROM `'._DB_PREFIX_.'country_lang`
+			$result = Db::getInstance()->getRow('
+			SELECT `name` FROM `'._DB_PREFIX_.'country_lang`
 												WHERE `id_country` = '.(int)$this->id_country.'
 												AND `id_lang` = '.($id_lang ? (int)$id_lang : Configuration::get('PS_LANG_DEFAULT')));
 			$this->country = $result['name'];