refs #1900, fixes #1911

git-svn-id: http://dev.piwik.org/svn/trunk@3508 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 18 insertions, 2 deletions

diff --git a/core/Cookie.php b/core/Cookie.php
index 105196fa69..4b27163e8b 100644
--- a/core/Cookie.php
+++ b/core/Cookie.php
@@ -226,7 +226,15 @@ class Piwik_Cookie
 			// no numeric value are base64 encoded so we need to decode them
 			if(!is_numeric($varValue))
 			{
-				$varValue = json_decode(base64_decode($varValue), $assoc = true);
+				// @see http://bugs.php.net/38680
+				if(PHP_VERSION == '5.2.0')
+				{
+					$varValue = safe_unserialize(base64_decode($varValue));
+				}
+				else
+				{
+					$varValue = json_decode(base64_decode($varValue), $assoc = true);
+				}
 			}
 			
 			$this->value[$varName] = $varValue;
@@ -246,7 +254,15 @@ class Piwik_Cookie
 		{
 			if(!is_numeric($value))
 			{
-				$value = base64_encode(json_encode($value));
+				// @see http://bugs.php.net/38680
+				if(PHP_VERSION == '5.2.0')
+				{
+					$value = base64_encode(safe_serialize($value));
+				}
+				else
+				{
+					$value = base64_encode(json_encode($value));
+				}
 			}
 		
 			$cookieStr .= "$name=$value" . self::VALUE_SEPARATOR;