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
This commit is contained in:
rGaillard committed 2012-10-16 09:41:09 +00:00
1 parent ca819a60fe
commit 2805ece864
1 file changed
+6 -1
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['ordered'] = AddressFormat::getOrderedAddressFields((int)$address->id_country);
$layoutData['formated'] = AddressFormat::getFormattedAddressFieldsValues($address, $layoutData['ordered']); $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; return $layoutData;
} }