Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

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

diff --git a/actions/register.php b/actions/register.php
index 35c1ddd4bd383369c6b88483f6546bcc59efbd02..eefbc340a1f427f5484ff5a3f5978f007edf6e5e 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -140,6 +140,12 @@ class RegisterAction extends Action
         }
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('nickname');
+    }
+
     /**
      * Try to register a user
      *