diff options
| author | CiaranG <ciaran@ciarang.com> | 2009-03-08 01:11:22 +0000 |
|---|---|---|
| committer | CiaranG <ciaran@ciarang.com> | 2009-03-08 01:11:22 +0000 |
| commit | 61940e37ff89710628eff1a4ad6db8df16142cec (patch) | |
| tree | d56214cb07f443a26c46aa25546a951d2162f972 | |
| parent | a4091c878a923d7a0919098665906225ebeeb136 (diff) | |
| parent | f9a7ae27b8879569a3f0eff478cbd3b650bdca28 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
| -rw-r--r-- | actions/grouplogo.php | 2 | ||||
| -rw-r--r-- | actions/joingroup.php | 2 | ||||
| -rw-r--r-- | actions/leavegroup.php | 2 | ||||
| -rw-r--r-- | lib/grouplist.php | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 499db4ae8..fe6127da2 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -83,7 +83,7 @@ class GrouplogoAction extends Action if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); - common_redirect(common_local_url('editgroup', $args), 301); + common_redirect(common_local_url('grouplogo', $args), 301); return false; } diff --git a/actions/joingroup.php b/actions/joingroup.php index 1888ecdab..eeea4a37b 100644 --- a/actions/joingroup.php +++ b/actions/joingroup.php @@ -73,7 +73,7 @@ class JoingroupAction extends Action if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); - common_redirect(common_local_url('editgroup', $args), 301); + common_redirect(common_local_url('joingroup', $args), 301); return false; } diff --git a/actions/leavegroup.php b/actions/leavegroup.php index c7152e3c0..1d85aa3d5 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -73,7 +73,7 @@ class LeavegroupAction extends Action if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); - common_redirect(common_local_url('editgroup', $args), 301); + common_redirect(common_local_url('leavegroup', $args), 301); return false; } diff --git a/lib/grouplist.php b/lib/grouplist.php index 1b8547499..8e2637fec 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -164,8 +164,10 @@ class GroupList extends Widget # XXX: special-case for user looking at own # subscriptions page if ($user->isMember($this->group)) { - $lf = new LeaveForm($this->out, $this->group); - $lf->show(); + if (!$user->isAdmin($this->group)) { + $lf = new LeaveForm($this->out, $this->group); + $lf->show(); + } } else { $jf = new JoinForm($this->out, $this->group); $jf->show(); |