We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit dfd65a42 authored by Evan Prodromou's avatar Evan Prodromou

push exception on missing profile down to Notice::getProfile()

parent ab149755
......@@ -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()
......
......@@ -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
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment