Fix: Use bad var for test

This commit is contained in:
Laurent Destailleur 2014-06-22 13:33:31 +02:00
parent 62b0d8a472
commit c18d7de7b0
2 changed files with 6 additions and 2 deletions

View File

@ -465,6 +465,10 @@ class Conf
$this->bank->rappro->warning_delay=(isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE)?$this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE:0)*24*60*60;
$this->bank->cheque->warning_delay=(isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT)?$this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT:0)*24*60*60;
// For modules that want to disable top or left menu
if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
// For backward compatibility
if (isset($this->product)) $this->produit=$this->product;
if (isset($this->facture)) $this->invoice=$this->facture;

View File

@ -891,11 +891,11 @@ if (! function_exists("llxHeader"))
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
// top menu and left menu area
if (empty($conf->global->MAIN_HIDE_TOP_MENU))
if (empty($conf->dol_hide_topmenu))
{
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring);
}
if (empty($conf->global->MAIN_HIDE_LEFT_MENU))
if (empty($conf->dol_hide_leftmenu))
{
left_menu('', $help_url, '', '', 1, $title);
}