diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
commit | 9b366547d743b9c85455e02cae2f84a658a4baf2 (patch) | |
tree | 815817fdd6a88f9cac18de9f8be0544bb8df3a80 /actions/showgroup.php | |
parent | 517fd54b6515375b075a5d7253a8b66e53785baa (diff) | |
parent | 88ae7f53bb4470a899678d231cecb8cb963b2075 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/showgroup.php')
-rw-r--r-- | actions/showgroup.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 0139ba157..4e1fcb6c7 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -125,14 +125,6 @@ class ShowgroupAction extends GroupDesignAction $local = Local_group::staticGet('nickname', $nickname); if (!$local) { - common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'"); - $this->clientError(_('No such group.'), 404); - return false; - } - - $this->group = User_group::staticGet('id', $local->group_id); - - if (!$this->group) { $alias = Group_alias::staticGet('alias', $nickname); if ($alias) { $args = array('id' => $alias->group_id); @@ -142,11 +134,19 @@ class ShowgroupAction extends GroupDesignAction common_redirect(common_local_url('groupbyid', $args), 301); return false; } else { + common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'"); $this->clientError(_('No such group.'), 404); return false; } } + $this->group = User_group::staticGet('id', $local->group_id); + + if (!$this->group) { + $this->clientError(_('No such group.'), 404); + return false; + } + common_set_returnto($this->selfUrl()); return true; |