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

// Fix bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15892 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-06-07 07:59:31 +00:00
parent 061cfb7f5c
commit 28fa816b36
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+3 -3
View File
@@ -2128,10 +2128,10 @@ FileETag INode MTime Size
public static function unSerialize($serialized, $object = false) public static function unSerialize($serialized, $object = false)
{ {
if (is_string($serialized) && ((strpos($serialized, 'O:') !== false && !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized) && !$object) || $object)) if (is_string($serialized) && (strpos($serialized, 'O:') === false || !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized)) && !$object || $object)
return @unserialize($serialized); return @unserialize($serialized);
return false; return false;
} }
} }