diff --git a/actions/showgroup.php b/actions/showgroup.php index 0139ba157d..4e1fcb6c7b 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;