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

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-03-07 17:14:55 -08:00
commit d014d43c68
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/grouplogo.php
View File

@ -83,7 +83,7 @@ class GrouplogoAction extends Action
if ($nickname_arg != $nickname) { if ($nickname_arg != $nickname) {
$args = array('nickname' => $nickname); $args = array('nickname' => $nickname);
common_redirect(common_local_url('editgroup', $args), 301); common_redirect(common_local_url('grouplogo', $args), 301);
return false; return false;
} }

2
actions/joingroup.php
View File

@ -73,7 +73,7 @@ class JoingroupAction extends Action
if ($nickname_arg != $nickname) { if ($nickname_arg != $nickname) {
$args = array('nickname' => $nickname); $args = array('nickname' => $nickname);
common_redirect(common_local_url('editgroup', $args), 301); common_redirect(common_local_url('joingroup', $args), 301);
return false; return false;
} }

2
actions/leavegroup.php
View File

@ -73,7 +73,7 @@ class LeavegroupAction extends Action
if ($nickname_arg != $nickname) { if ($nickname_arg != $nickname) {
$args = array('nickname' => $nickname); $args = array('nickname' => $nickname);
common_redirect(common_local_url('editgroup', $args), 301); common_redirect(common_local_url('leavegroup', $args), 301);
return false; return false;
} }

2
lib/grouplist.php
View File

@ -164,8 +164,10 @@ class GroupList extends Widget
# XXX: special-case for user looking at own # XXX: special-case for user looking at own
# subscriptions page # subscriptions page
if ($user->isMember($this->group)) { if ($user->isMember($this->group)) {
if (!$user->isAdmin($this->group)) {
$lf = new LeaveForm($this->out, $this->group); $lf = new LeaveForm($this->out, $this->group);
$lf->show(); $lf->show();
}
} else { } else {
$jf = new JoinForm($this->out, $this->group); $jf = new JoinForm($this->out, $this->group);
$jf->show(); $jf->show();