From a858025d6397cb6b0a472db200b3aaf81b044365 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 3 Apr 2019 16:34:02 +0200
Subject: [PATCH] Option MAIN_TOP_MENU_DROPDOWN removed. New dropdown is always
 on now.

---
 htdocs/main.inc.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5d68dd5b495..74069429043 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1596,10 +1596,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			}
 		}
 
-		$loginBlockMoreClass = '';
-		if (!empty($conf->global->MAIN_TOP_MENU_DROPDOWN)) { $loginBlockMoreClass = 'usedropdown'; }
-
-		print '<div class="login_block '.$loginBlockMoreClass.'">'."\n";
+		print '<div class="login_block usedropdown">'."\n";
 
 		// Add login user link
 		$toprightmenu.='<div class="login_block_user">';
@@ -1608,12 +1605,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		$mode=-1;
 		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
 
-		if (empty($conf->global->MAIN_TOP_MENU_DROPDOWN)){
-            $toprightmenu.= $user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
-		}
-		else {
-		    $toprightmenu.= top_menu_user($user, $langs);
-		}
+	    $toprightmenu.= top_menu_user($user, $langs);
+
 		$toprightmenu.='</div></div>';
 
 		$toprightmenu.='</div>'."\n";