dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Country.php
+9 -9
View File
@@ -157,7 +157,7 @@ class CountryCore extends ObjectModel
* @param string $iso_code Country iso code
* @return integer Country ID
*/
static public function getByIso($iso_code)
public static function getByIso($iso_code)
{
if (!Validate::isLanguageIsoCode($iso_code))
die(Tools::displayError());
@@ -169,7 +169,7 @@ class CountryCore extends ObjectModel
return $result['id_country'];
}
static public function getIdZone($id_country)
public static function getIdZone($id_country)
{
if (!Validate::isUnsignedId($id_country))
die(Tools::displayError());
@@ -193,7 +193,7 @@ class CountryCore extends ObjectModel
* @param integer $id_country Country ID
* @return string Country name
*/
static public function getNameById($id_lang, $id_country)
public static function getNameById($id_lang, $id_country)
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `name`
@@ -210,7 +210,7 @@ class CountryCore extends ObjectModel
* @param integer $id_country Country ID
* @return string Country iso
*/
static public function getIsoById($id_country)
public static function getIsoById($id_country)
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `iso_code`
@@ -227,7 +227,7 @@ class CountryCore extends ObjectModel
* @param string $country Country Name
* @return intval Country id
*/
static public function getIdByName($id_lang = NULL, $country)
public static function getIdByName($id_lang = NULL, $country)
{
$sql = '
SELECT `id_country`
@@ -241,7 +241,7 @@ class CountryCore extends ObjectModel
return ((int)($result['id_country']));
}
static public function getNeedZipCode($id_country)
public static function getNeedZipCode($id_country)
{
if (!(int)($id_country))
return false;
@@ -252,7 +252,7 @@ class CountryCore extends ObjectModel
WHERE `id_country` = '.(int)($id_country));
}
static public function getZipCodeFormat($id_country)
public static function getZipCodeFormat($id_country)
{
if (!(int)($id_country))
return false;
@@ -303,7 +303,7 @@ class CountryCore extends ObjectModel
return (bool)self::isNeedDniByCountryId($this->id);
}
static public function isNeedDniByCountryId($id_country)
public static function isNeedDniByCountryId($id_country)
{
return (bool)Db::getInstance()->getValue('
SELECT `need_identification_number`
@@ -311,7 +311,7 @@ class CountryCore extends ObjectModel
WHERE `id_country` = '.(int)$id_country);
}
static public function containsStates($id_country)
public static function containsStates($id_country)
{
return (bool)Db::getInstance()->getValue('
SELECT `contains_states`