From 2805ece864558e90f603cdfabc6896619fa7f485 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Tue, 16 Oct 2012 09:41:09 +0000
Subject: [PATCH] [-] FO: Fix #PSCFV-4960 recursion with json_encode on some
 php versions

---
 classes/AddressFormat.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php
index 4132b41c2..3989d1807 100644
--- a/classes/AddressFormat.php
+++ b/classes/AddressFormat.php
@@ -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;
 	}