summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vollick <psycotica0@gmail.com>2010-02-26 10:10:38 -0500
committerBrion Vibber <brion@pobox.com>2010-02-26 12:30:23 -0800
commitc95daacfdb6d89098716b8eeccfdd82124019d7a (patch)
tree3d120e4d4bc10850fc23c43080c28718db00a583
parent0060163a76652a5f6cbe3d32306308c6fa7f9d3c (diff)
Updated ShowGroup to Resolve Aliases Again.
The way we find groups changed with this new Local_group table. I had to update this too.
-rw-r--r--actions/showgroup.php16
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;