summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/Notice.php8
-rw-r--r--lib/apiaction.php8
2 files changed, 9 insertions, 7 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 482bc550b..ae7e2e540 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -90,7 +90,13 @@ class Notice extends Memcached_DataObject
function getProfile()
{
- return Profile::staticGet('id', $this->profile_id);
+ $profile = Profile::staticGet('id', $this->profile_id);
+
+ if (empty($profile)) {
+ throw new ServerException(sprintf(_('No such profile (%d) for notice (%d)'), $this->profile_id, $this->id));
+ }
+
+ return $profile;
}
function delete()
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 16dd87814..01985f0db 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -462,10 +462,6 @@ class ApiAction extends Action
{
$profile = $notice->getProfile();
- if (empty($profile)) {
- throw new ServerException(sprintf(_('No such profile: %d'), $notice->profile_id));
- }
-
$entry = array();
// We trim() to avoid extraneous whitespace in the output
@@ -798,7 +794,7 @@ class ApiAction extends Action
$entry = $this->twitterRssEntryArray($n);
$this->showTwitterRssItem($entry);
} catch (Exception $e) {
- common_log(LOG_ERR, "Error with notice {$n->id}: " . $e->getMessage());
+ common_log(LOG_ERR, $e->getMessage());
// continue on exceptions
}
}
@@ -808,7 +804,7 @@ class ApiAction extends Action
$entry = $this->twitterRssEntryArray($notice);
$this->showTwitterRssItem($entry);
} catch (Exception $e) {
- common_log(LOG_ERR, "Error with notice {$n->id}: " . $e->getMessage());
+ common_log(LOG_ERR, $e->getMessage());
// continue on exceptions
}
}