From 5fa6592d6ed37da6707d406aaebcb19827082dc0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Mar 2017 20:10:50 +0100 Subject: [PATCH] Fix bad conf used --- htdocs/core/class/conf.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 2ee8ef3c4f0..dc06bfe9ffa 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -560,6 +560,10 @@ class Conf $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60; } + if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) + { + $this->global->PRODUIT_MULTIPRICES_LIMIT = 5; + } // 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; @@ -588,7 +592,7 @@ class Conf } foreach ($handlers as $handler) { $handler_files = array(); - $dirsyslogs = array_merge(array('/core/modules/syslog/'), $conf->modules_parts['syslog']); + $dirsyslogs = array_merge(array('/core/modules/syslog/'), $this->modules_parts['syslog']); foreach ($dirsyslogs as $reldir) { $dir = dol_buildpath($reldir, 0); $newdir = dol_osencode($dir);