Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/get_menudiv.php
  • Loading branch information
eldy committed May 1, 2020
2 parents 625c721 + 1c7873b commit c1b530f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion htdocs/core/get_menudiv.php
Expand Up @@ -185,7 +185,7 @@

// 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;
Expand Down

2 comments on commit c1b530f

@eldy
Copy link
Member Author

@eldy eldy commented on c1b530f May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Credit for reporting: Julian Horoszkiewicz (ATOS CERT)

@eldy
Copy link
Member Author

@eldy eldy commented on c1b530f Jun 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.