log exceptions in atom feeds, but don't let them kill the output

diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index 6ed803ce4ebb35a0350f669b26fc098b896a3585..b8821729185fa2eb800331b4b26c9d948d5e9c80 100644 (file)
--- 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()