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:
Evan Prodromou
2010-09-09 15:01:03 -04:00
63 changed files with 6660 additions and 2176 deletions

View File

@@ -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;