diff options
| author | Brion Vibber <brion@pobox.com> | 2009-09-04 07:19:01 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-09-04 07:19:01 -0700 |
| commit | d635a0685df324d75e66d1f28dae4223c77a0875 (patch) | |
| tree | b19672b922b74760700a3882642cafae4190afdd /actions/login.php | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
| parent | 5974871b7b00bd8e3f28dc5f5a9465a9eec0d3d3 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/mainline into 0.9.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 4b00b2f08..f6d016310 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/ */ @@ -158,6 +160,12 @@ class LoginAction extends Action $this->showPage(); } + function showScripts() + { + parent::showScripts(); + $this->autofocus('nickname'); + } + /** * Title of the page * |