diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
| commit | 4419e43f7f62d92f01ba8f844aa9cd472051dd84 (patch) | |
| tree | 4c80501a0306c1cddd2427685824bef62683020b /classes | |
| parent | 6f95ccd37de1f7e2063206e87c93cbe06097eae7 (diff) | |
| parent | f2fd8b36f4a932f50770c84d769297bcfc1c1483 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
Diffstat (limited to 'classes')
| -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 e3d1e85cb..4c6efd3eb 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; |