Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist

[quix0rs-gnu-social.git] / lib / joinform.php

diff --git a/lib/joinform.php b/lib/joinform.php
index a19e014de7e52781db6a10bb6e7e861bb952ba1a..0918133a554ea57cfbab5a7fa3a148caf8979ab7 100644 (file)
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -21,14 +21,14 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -88,7 +88,7 @@ class JoinForm extends Form
 
     function formClass()
     {
-        return 'form_group_join';
+        return 'form_group_join ajax';
     }
 
     /**
@@ -100,7 +100,7 @@ class JoinForm extends Form
     function action()
     {
         return common_local_url('joingroup',
-                                array('nickname' => $this->group->nickname));
+                                array('id' => $this->group->id));
     }
 
     /**