diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php index f820f112b..586234103 100644 --- a/classes/AddressFormat.php +++ b/classes/AddressFormat.php @@ -316,8 +316,8 @@ class AddressFormatCore extends ObjectModel // Check if the property exist in both classes if (($totalName == 2) && class_exists($associateName[0]) && - Tools::property_exists($associateName[0], $associateName[1]) && - Tools::property_exists($address, 'id_'.strtolower($associateName[0]))) + property_exists($associateName[0], $associateName[1]) && + property_exists($address, 'id_'.strtolower($associateName[0]))) { $idFieldName = 'id_'.strtolower($associateName[0]); diff --git a/classes/Tools.php b/classes/Tools.php index b187140f1..e39abf616 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1667,12 +1667,15 @@ FileETag INode MTime Size /** * Function property_exists does not exist in PHP < 5.1 * + * @deprecated since 1.5.0 (PHP 5.1 required, so property_exists() is now natively supported) * @param object or class $class * @param string $property * @return boolean */ public static function property_exists($class, $property) { + Tools::displayAsDeprecated(); + if (function_exists('property_exists')) return property_exists($class, $property); diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php index 4a4dbd9f2..e924ceed2 100644 --- a/classes/webservice/WebserviceRequest.php +++ b/classes/webservice/WebserviceRequest.php @@ -1420,7 +1420,7 @@ class WebserviceRequestCore else $object->$fieldProperties['setter']((string)$attributes->$fieldName); } - elseif (Tools::property_exists($object, $sqlId)) + elseif (property_exists($object, $sqlId)) $object->$sqlId = (string)$attributes->$fieldName; else $this->setError(400, 'Parameter "'.$fieldName.'" can\'t be set to the object "'.$this->resourceConfiguration['retrieveData']['className'].'"', 123); @@ -1431,7 +1431,7 @@ class WebserviceRequestCore $this->setError(400, 'parameter "'.$fieldName.'" required', 41); return false; } - elseif ((!isset($fieldProperties['required']) || !$fieldProperties['required']) && Tools::property_exists($object, $sqlId)) + elseif ((!isset($fieldProperties['required']) || !$fieldProperties['required']) && property_exists($object, $sqlId)) $object->$sqlId = null; if (isset($fieldProperties['i18n']) && $fieldProperties['i18n']) diff --git a/install-dev/index.php b/install-dev/index.php index 780aaae6c..91c748e65 100644 --- a/install-dev/index.php +++ b/install-dev/index.php @@ -345,11 +345,11 @@ if ($lm->getIncludeTradFilename())

- getIsoCodeSelectedLang(), array('fr', 'it', 'de', 'en', 'es')) ? $lm->getIsoCodeSelectedLang() : 'en'); echo lang('Prestashop and its community offers over 40 different languages for free download at'); - + ?>
http://www.prestashop.com//downloads/#lang_pack

@@ -772,9 +772,9 @@ if ($lm->getIncludeTradFilename()) function getPreinstallXmlLang($object, $field) { - if (Tools::property_exists($object, $field.'_'.((int)($_GET['language'])+1))) + if (property_exists($object, $field.'_'.((int)($_GET['language'])+1))) return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_'.((int)($_GET['language'])+1)})); - if (Tools::property_exists($object, $field.'_1')) + if (property_exists($object, $field.'_1')) return str_replace(array('!|', '|!'), array('<', '>'), trim($object->{$field.'_1'})); return ''; }