diff options
author | Brion Vibber <brion@pobox.com> | 2010-09-08 11:48:09 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-09-08 11:48:09 -0700 |
commit | c758b2b0005cd434ff679686b6e11df60a65e1cb (patch) | |
tree | 2c7fba4a9dcbc67c25ada93697ec67381808c7cd /classes/Notice.php | |
parent | f2574fdd0122d484724dda7efdfbb8cb1a668939 (diff) | |
parent | 7407754c2714248eebc995412a3aee881df2a238 (diff) |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 14477b1b5..f1b012465 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -583,7 +583,9 @@ class Notice extends Memcached_DataObject if ($f2p->find()) { while ($f2p->fetch()) { $f = File::staticGet($f2p->file_id); - $att[] = clone($f); + if ($f) { + $att[] = clone($f); + } } } return $att; |