diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index dafa35fa050efef5dd3ae0cf471126a51ffec21b..31014563833656d7d50b3c92125ed906c6585f5b 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -213,7 +213,7 @@ function dol_loginfunction($langs,$conf,$mysoc) { $mc = new ActionsMulticompany($db); - $select_entity=$mc->select_entities($lastentity, 1, 'tabindex="3"'); + $select_entity=$mc->select_entities($lastentity, 'tabindex="3"'); } } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d2403e4efde95d49f5a47ebfad3321775ad3680e..ae9f613ccdcdc08a882d4be56823d0c95b758a1a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1186,12 +1186,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if ($res) { - //$mc = new ActionsMulticompany($db); + $mc = new ActionsMulticompany($db); + $mc->getInfo($conf->entity); $entitytext = img_object('', 'globe',"class='entity'"); - $entityhtmltext = 'EntityName'; + $entityhtmltext = $mc->label; print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext,'',1); //$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>'; - //if ($mc->numEntity >= 1) print $select_entity; + //print $select_entity; } } } diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 4560722e46c0f13e11b48de253ba3d8b9153c5b5..ac6ed3edefa0295f50882544d9bcd3e6c194eee5 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -234,7 +234,7 @@ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && ! $disabled) if ($res) { $mc = new ActionsMulticompany($db); - $select_entity = $mc->select_entities($lastentity,0,'tabindex="2"'); + $select_entity = $mc->select_entities($lastentity,'tabindex="2"'); } }