diff options
author | Brion Vibber <brion@pobox.com> | 2010-07-28 11:59:42 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-07-28 11:59:42 -0700 |
commit | ab2c3686b7711f3d0e727093b487fcb54448cc39 (patch) | |
tree | b42bbd7ca1be71f3b5f72e8461096f6e3c95b2c3 /lib/atomnoticefeed.php | |
parent | d645b342ac4a678b9f7932ee38858e25cd611f35 (diff) | |
parent | 189d34173311828ccfe0aec5f381ad26887384ce (diff) |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib/atomnoticefeed.php')
-rw-r--r-- | lib/atomnoticefeed.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index 6ed803ce4..b88217291 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -125,12 +125,17 @@ class AtomNoticeFeed extends Atom10Feed */ function addEntryFromNotice($notice) { - $source = $this->showSource(); - $author = $this->showAuthor(); + try { + $source = $this->showSource(); + $author = $this->showAuthor(); - $cur = empty($this->cur) ? common_current_user() : $this->cur; + $cur = empty($this->cur) ? common_current_user() : $this->cur; - $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); + $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); + } catch (Exception $e) { + common_log(LOG_ERR, $e->getMessage()); + // we continue on exceptions + } } function showSource() |