Merge branch 'testing' into 0.9.x
This commit is contained in:
commit
c758b2b000
|
@ -583,9 +583,11 @@ class Notice extends Memcached_DataObject
|
||||||
if ($f2p->find()) {
|
if ($f2p->find()) {
|
||||||
while ($f2p->fetch()) {
|
while ($f2p->fetch()) {
|
||||||
$f = File::staticGet($f2p->file_id);
|
$f = File::staticGet($f2p->file_id);
|
||||||
|
if ($f) {
|
||||||
$att[] = clone($f);
|
$att[] = clone($f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return $att;
|
return $att;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,12 @@ class RSSCloudQueueHandler extends QueueHandler
|
||||||
|
|
||||||
function handle($notice)
|
function handle($notice)
|
||||||
{
|
{
|
||||||
|
try {
|
||||||
$profile = $notice->getProfile();
|
$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();
|
$notifier = new RSSCloudNotifier();
|
||||||
return $notifier->notify($profile);
|
return $notifier->notify($profile);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user