diff options
author | Brion Vibber <brion@pobox.com> | 2009-10-12 21:01:34 +0000 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2009-10-12 21:01:34 +0000 |
commit | 18df82ba2302d5b72bc42f4d3296d6fff7d16341 (patch) | |
tree | ce2f955ff860b8d7355d64391d68a0f955067ec9 /actions/login.php | |
parent | 131292472c4bca7e99ee821ae62853f36f4c7bef (diff) | |
parent | 2b6dfbdf2b9df0992018f8df1f54b4cf16185599 (diff) |
Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x
Diffstat (limited to 'actions/login.php')
-rw-r--r-- | actions/login.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actions/login.php b/actions/login.php index 37f3c54ff..ac8c40c3e 100644 --- a/actions/login.php +++ b/actions/login.php @@ -22,6 +22,7 @@ * @category Login * @package StatusNet * @author Evan Prodromou <evan@status.net> + * @author Sarven Capadisli <csarven@status.net> * @copyright 2008-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/ @@ -37,6 +38,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @category Personal * @package StatusNet * @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/ */ @@ -162,6 +164,12 @@ class LoginAction extends Action $this->showPage(); } + function showScripts() + { + parent::showScripts(); + $this->autofocus('nickname'); + } + /** * Title of the page * |