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

[-] FO: Fix #PSCFV-4960 recursion with json_encode on some php versions

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17869 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-16 09:41:09 +00:00
parent 989d66a650
commit c25252cc42
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+6 -1
View File
@@ -491,7 +491,12 @@ class AddressFormatCore extends ObjectModel
{
$layoutData['ordered'] = AddressFormat::getOrderedAddressFields((int)$address->id_country);
$layoutData['formated'] = AddressFormat::getFormattedAddressFieldsValues($address, $layoutData['ordered']);
$layoutData['object'] = get_object_vars($address);
$layoutData['object'] = array();
$reflect = new ReflectionObject($address);
$public_properties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
foreach ($public_properties as $property)
$layoutData['object'][$property->getName()] = $address->{$property->getName()};
}
return $layoutData;
}