diff options
author | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
commit | 6a1afda259c5223449f679a64f932e36df5ebe39 (patch) | |
tree | 7d754e8a1b7734c6750ca84b28ba0e93213e0a86 /actions/apitimelinegroup.php | |
parent | d59af0296070cd868855564a0280e4be2c16410d (diff) | |
parent | 75c00f0054c08c7b49515c849260afbb6913f525 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
classes/statusnet.ini
Diffstat (limited to 'actions/apitimelinegroup.php')
-rw-r--r-- | actions/apitimelinegroup.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index f25f6ba51..de13e7eb9 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction parent::prepare($args); $this->group = $this->getTargetGroup($this->arg('id')); - $this->notices = $this->getNotices(); return true; } @@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function handle($args) { parent::handle($args); + + if (empty($this->group)) { + $this->clientError(_('Group not found!'), 404, $this->format); + return false; + } + + $this->notices = $this->getNotices(); $this->showTimeline(); } |