eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-09-08 11:48:09 -07:00
commit c758b2b000
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Notice.php
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;

7
plugins/RSSCloud/RSSCloudQueueHandler.php
View File

@ -28,7 +28,12 @@ class RSSCloudQueueHandler extends QueueHandler
function handle($notice)
{
$profile = $notice->getProfile();
try {
$profile = $notice->getProfile();
} catch (Exception $e) {
common_log(LOG_ERR, "Dropping RSSCloud item for notice with bogus profile: " . $e->getMessage());
return true;
}
$notifier = new RSSCloudNotifier();
return $notifier->notify($profile);
}