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

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 499db4ae8d7da865da7c5aaf037b147bbb3cab17..fe6127da296243a0c13f15625a8fc57f162f5c83 100644 (file)
--- 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 1888ecdab27389420aa5a3e84b8390cb60687e28..eeea4a37bfb1ed9b0233c8f74f8362aad24d94fe 100644 (file)
--- 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 c7152e3c0e32cc9db0b46855c28b3140570a8218..1d85aa3d521f2e68a1e84760e017a25693e8f017 100644 (file)
--- 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 1b854749982198e68f89de742d2c1fd306e3ce1c..8e2637fec9626de9615f6243b2e3cba5dd19acee 100644 (file)
--- 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();