GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Updated ShowGroup to Resolve Aliases Again.

Browse Source 
The way we find groups changed with this new Local_group table.
I had to update this too.
This commit is contained in:
Christopher Vollick 2010-02-26 10:10:38 -05:00 committed by Brion Vibber
parent 0060163a76
commit c95daacfdb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/showgroup.php
View File

@ -125,14 +125,6 @@ class ShowgroupAction extends GroupDesignAction
$local = Local_group::staticGet('nickname', $nickname); $local = Local_group::staticGet('nickname', $nickname);
if (!$local) { 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); $alias = Group_alias::staticGet('alias', $nickname);
if ($alias) { if ($alias) {
$args = array('id' => $alias->group_id); $args = array('id' => $alias->group_id);
@ -142,11 +134,19 @@ class ShowgroupAction extends GroupDesignAction
common_redirect(common_local_url('groupbyid', $args), 301); common_redirect(common_local_url('groupbyid', $args), 301);
return false; return false;
} else { } else {
common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
$this->clientError(_('No such group.'), 404); $this->clientError(_('No such group.'), 404);
return false; 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()); common_set_returnto($this->selfUrl());
return true; return true;