Merge branch '0.9.x' into 1.0.x
Conflicts: EVENTS.txt plugins/TwitterBridge/daemons/twitterstatusfetcher.php plugins/TwitterBridge/twitterbasicauthclient.php
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user