summaryrefslogtreecommitdiff
path: root/lib/ping.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-29 11:14:00 -0400
committerEvan Prodromou <evan@status.net>2010-10-29 11:14:00 -0400
commit36baff3d41c1475f09dbc4f049eca0da4c2ad04f (patch)
treee44ae43af00dfe4b92c7e66054890ed4feeb48f4 /lib/ping.php
parentc8dab140f41a397c245a8858cb6030e2c985012c (diff)
parentfb0c3f4f991464e36932137730743131f8ace68c (diff)
Merge remote branch 'gitorious/master'
Diffstat (limited to 'lib/ping.php')
-rw-r--r--lib/ping.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/ping.php b/lib/ping.php
index be2933ae3..abf1c4048 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -27,7 +27,14 @@ function ping_broadcast_notice($notice) {
# Array of servers, URL => type
$notify = common_config('ping', 'notify');
- $profile = $notice->getProfile();
+ try {
+ $profile = $notice->getProfile();
+ } catch (Exception $e) {
+ // @todo: distinguish the 'broken notice/profile' case from more general
+ // transitory errors.
+ common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage());
+ return true;
+ }
$tags = ping_notice_tags($notice);
foreach ($notify as $notify_url => $type) {