[*] Classes: Tools::property_exists() is deprecated, since PrestaShop now requires 5.1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9408 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -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]);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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'])
|
||||
|
||||
Reference in New Issue
Block a user