summaryrefslogtreecommitdiff
path: root/classes/Notice.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-09-08 11:47:44 -0700
committerBrion Vibber <brion@pobox.com>2010-09-08 11:47:44 -0700
commit7407754c2714248eebc995412a3aee881df2a238 (patch)
tree5ade211b1755df5fffa254de28cf838d35b76df4 /classes/Notice.php
parent58b5ff718a5fa209dce5dd23d6d0fb35d30facd6 (diff)
parentd470c007fc18c9112804155e495ff295cd60ef88 (diff)
Merge branch 'master' into testing
Diffstat (limited to 'classes/Notice.php')
-rw-r--r--classes/Notice.php4
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;