From 27e59bac9a15a3c3be7254f42b4856e42b9e92a1 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 29 Jan 2014 22:49:05 +1300 Subject: [PATCH] Fixes #4496 --- plugins/Annotations/AnnotationList.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Annotations/AnnotationList.php b/plugins/Annotations/AnnotationList.php index deca05a5576..2ee58cffb3a 100755 --- a/plugins/Annotations/AnnotationList.php +++ b/plugins/Annotations/AnnotationList.php @@ -316,7 +316,11 @@ private function getAnnotationsForSite() $serialized = Option::get($optionName); if ($serialized !== false) { - $result[$id] = unserialize($serialized); + $result[$id] = @unserialize($serialized); + if(empty($result[$id])) { + // in case unserialize failed + $result[$id] = array(); + } } else { $result[$id] = array(); }