Commit c758b2b0 authored by Brion Vibber's avatar Brion Vibber

Merge branch 'testing' into 0.9.x

parents f2574fdd 7407754c
......@@ -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;
......
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment