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

[quix0rs-gnu-social.git] / actions / joingroup.php

diff --git a/actions/joingroup.php b/actions/joingroup.php
index 45470f0888be7e7edff2509fc9de9850aec6808e..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;
         }
 
@@ -91,7 +91,7 @@ class JoingroupAction extends Action
 
         $cur = common_current_user();
 
-        if ($cur->isMember($group)) {
+        if ($cur->isMember($this->group)) {
             $this->clientError(_('You are already a member of that group'), 403);
             return false;
         }