Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/core/get_menudiv.php
This commit is contained in:
Laurent Destailleur 2020-05-01 15:56:01 +02:00
commit c1b530f58f

View File

@ -185,7 +185,7 @@ else // If external user
// Load the menu manager (only if not already done)
$file_menu = $conf->standard_menu;
if (GETPOST('menu')) $file_menu = GETPOST('menu'); // example: menu=eldy_menu.php
if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09'); // example: menu=eldy_menu.php
if (!class_exists('MenuManager'))
{
$menufound = 0;