// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
+3 -3
View File
@@ -276,7 +276,7 @@ class AddressCore extends ObjectModel
return isset($result['used']) ? $result['used'] : false;
}
static public function getCountryAndState($id_address)
public static function getCountryAndState($id_address)
{
if (isset(self::$_idCountries[$id_address]))
return self::$_idCountries[$id_address];
@@ -293,7 +293,7 @@ class AddressCore extends ObjectModel
* @param $id_address Address id
* @return boolean
*/
static public function addressExists($id_address)
public static function addressExists($id_address)
{
$row = Db::getInstance()->getRow('
SELECT `id_address`
@@ -303,7 +303,7 @@ class AddressCore extends ObjectModel
return isset($row['id_address']);
}
static public function getFirstCustomerAddressId($id_customer, $active = true)
public static function getFirstCustomerAddressId($id_customer, $active = true)
{
return Db::getInstance()->getValue('
SELECT `id_address`