diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-09-09 22:52:38 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-09-09 22:52:38 -0400 |
| commit | d7ae0ed4fd755ebad0788a17d0f2fb6a6ca9d63b (patch) | |
| tree | df58e167fe84f49af11edce4d0a7ebc34e480510 /actions/profilesettings.php | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
| parent | aecdba1ded89b45f32d0b7615ce6b103478403dd (diff) | |
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
lib/omb.php
Diffstat (limited to 'actions/profilesettings.php')
| -rw-r--r-- | actions/profilesettings.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 83051c6fd..5445d9bb2 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Evan Prodromou <evan@status.net> * @author Zach Copley <zach@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/ @@ -41,6 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php'; * @package StatusNet * @author Evan Prodromou <evan@status.net> * @author Zach Copley <zach@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/ */ @@ -70,6 +72,12 @@ class ProfilesettingsAction extends AccountSettingsAction 'so people know more about you.'); } + function showScripts() + { + parent::showScripts(); + $this->autofocus('nickname'); + } + /** * Content area of the page * |