HTML output in RSS 2.0 and Atom

[quix0rs-gnu-social.git] / lib / settingsaction.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 9aa5247d9dbba0ad309b52b044581fa1fa0daa1c..9e783431f23586073429c867546e3cddbc7b3a89 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -86,12 +86,6 @@ class SettingsAction extends Action {
                                'emailsettings' =>
                                array(_('Email'),
                                          _('Change email handling')),
-                               'avatar' =>
-                               array(_('Avatar'),
-                                         _('Upload a new profile image')),
-                               'password' =>
-                               array(_('Password'),
-                                         _('Change your password')),
                                'openidsettings' =>
                                array(_('OpenID'),
                                          _('Add or remove OpenIDs')),
@@ -103,11 +97,18 @@ class SettingsAction extends Action {
                                          _('Updates by instant messenger (IM)')),
                                'twittersettings' =>
                                array(_('Twitter'),
-                                         _('Twitter integration options')));
+                                         _('Twitter integration options')),
+                               'othersettings' =>
+                               array(_('Other'),
+                                         _('Other options')));
                
         $action = $this->trimmed('action');
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
+                       if ($menuaction == 'imsettings' &&
+                               !common_config('xmpp', 'enabled')) {
+                               continue;
+                       }
             common_menu_item(common_local_url($menuaction),
                     $menudesc[0],
                     $menudesc[1],