diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-01-29 13:49:05 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-01-31 01:30:23 +0400 |
| commit | 27e59bac9a15a3c3be7254f42b4856e42b9e92a1 (patch) | |
| tree | d9b991152515c196c307772d0564019e6ed104eb /plugins/Annotations | |
| parent | 1e4e50887b6278e2ccec76d2416f0db096abcec0 (diff) | |
Fixes #4496
Diffstat (limited to 'plugins/Annotations')
| -rwxr-xr-x | plugins/Annotations/AnnotationList.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/Annotations/AnnotationList.php b/plugins/Annotations/AnnotationList.php index deca05a557..2ee58cffb3 100755 --- a/plugins/Annotations/AnnotationList.php +++ b/plugins/Annotations/AnnotationList.php @@ -316,7 +316,11 @@ class AnnotationList $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(); } |