From 28fa816b365328fe36895a77650eb0d92139e3ed Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 7 Jun 2012 07:59:31 +0000 Subject: [PATCH] // Fix bug git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15892 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Tools.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index ab67fd917..d7a70a4dd 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -2128,10 +2128,10 @@ FileETag INode MTime Size public static function unSerialize($serialized, $object = false) { - if (is_string($serialized) && ((strpos($serialized, 'O:') !== false && !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized) && !$object) || $object)) - return @unserialize($serialized); - - return false; + if (is_string($serialized) && (strpos($serialized, 'O:') === false || !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized)) && !$object || $object) + return @unserialize($serialized); + + return false; } }