forked from GNUsocial/gnu-social
Fix for disappearing 'connect' menu if xmpp and sms are disabled.
All 'connect' menu panels used to be optional, so Action tried to figure out what the first item on the 'connect' menu should be. This is no longer necessary because we have the non-optional OAuth client connections panel now, which is not optional and can't be turned off.
This commit is contained in:
@@ -307,23 +307,14 @@ class MobileProfilePlugin extends WAP20Plugin
|
||||
function _showPrimaryNav($action)
|
||||
{
|
||||
$user = common_current_user();
|
||||
$connect = '';
|
||||
if (common_config('xmpp', 'enabled')) {
|
||||
$connect = 'imsettings';
|
||||
} else if (common_config('sms', 'enabled')) {
|
||||
$connect = 'smssettings';
|
||||
}
|
||||
|
||||
$action->elementStart('ul', array('id' => 'site_nav_global_primary'));
|
||||
if ($user) {
|
||||
$action->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
|
||||
_('Home'));
|
||||
$action->menuItem(common_local_url('profilesettings'),
|
||||
_('Account'));
|
||||
if ($connect) {
|
||||
$action->menuItem(common_local_url($connect),
|
||||
$action->menuItem(common_local_url('oauthconnectionssettings'),
|
||||
_('Connect'));
|
||||
}
|
||||
if ($user->hasRight(Right::CONFIGURESITE)) {
|
||||
$action->menuItem(common_local_url('siteadminpanel'),
|
||||
_('Admin'), _('Change site configuration'), false, 'nav_admin');
|
||||
|
Reference in New Issue
Block a user