diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
| commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
| tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /lib/accountsettingsaction.php | |
| parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
| parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'lib/accountsettingsaction.php')
| -rw-r--r-- | lib/accountsettingsaction.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php index 57740f8b8..7991c9002 100644 --- a/lib/accountsettingsaction.php +++ b/lib/accountsettingsaction.php @@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/settingsaction.php'; * * @see Widget */ - class AccountSettingsAction extends SettingsAction { /** @@ -54,7 +53,6 @@ class AccountSettingsAction extends SettingsAction * * @return void */ - function showLocalNav() { $menu = new AccountSettingsNav($this); @@ -73,7 +71,6 @@ class AccountSettingsAction extends SettingsAction * * @see HTMLOutputter */ - class AccountSettingsNav extends Widget { var $action = null; @@ -83,7 +80,6 @@ class AccountSettingsNav extends Widget * * @param Action $action current action, used for output */ - function __construct($action=null) { parent::__construct($action); @@ -95,7 +91,6 @@ class AccountSettingsNav extends Widget * * @return void */ - function show() { $action_name = $this->action->trimmed('action'); |