summaryrefslogtreecommitdiff
path: root/lib/rssaction.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-03 16:05:03 -0700
committerEvan Prodromou <evan@status.net>2010-08-03 16:05:03 -0700
commit9f0715a9935966f3ec483bccc476d5baf3324b3c (patch)
tree9874247927e5e24044c75a48a9c04e427b0ba477 /lib/rssaction.php
parent004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff)
parentb17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff)
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/rssaction.php')
-rw-r--r--lib/rssaction.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 62e3f21b6..f366db972 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -178,7 +178,13 @@ class Rss10Action extends Action
if (count($this->notices)) {
foreach ($this->notices as $n) {
- $this->showItem($n);
+ try {
+ $this->showItem($n);
+ } catch (Exception $e) {
+ // log exceptions and continue
+ common_log(LOG_ERR, $e->getMessage());
+ continue;
+ }
}
}
@@ -232,7 +238,7 @@ class Rss10Action extends Action
function showItem($notice)
{
- $profile = Profile::staticGet($notice->profile_id);
+ $profile = $notice->getProfile();
$nurl = common_local_url('shownotice', array('notice' => $notice->id));
$creator_uri = common_profile_uri($profile);
$this->elementStart('item', array('rdf:about' => $notice->uri,