summaryrefslogtreecommitdiff
path: root/actions/leavegroup.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-12 11:56:23 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-12 11:56:23 -0400
commitb3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (patch)
tree76666150701f03205bfff77e7d034dfa724f8764 /actions/leavegroup.php
parent399669b1fb955d2d8c18098a7b551184d534a94c (diff)
parente185c0395a6cd250ccd7c8e385c54830be73f937 (diff)
Merge branch '0.7.x' into 0.8.x
Conflicts: classes/Notice.php lib/action.php lib/router.php lib/twitter.php
Diffstat (limited to 'actions/leavegroup.php')
-rw-r--r--actions/leavegroup.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index c7152e3c0..eb30d0e50 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;
}
@@ -96,12 +96,6 @@ class LeavegroupAction extends Action
return false;
}
- if ($cur->isAdmin($this->group)) {
- $this->clientError(_('You may not leave a group while you are its administrator.'), 403);
- return false;
-
- }
-
return true;
}