Fix bad conf used

Dolibarr · Mar 4, 2017 · 5fa6592 · 5fa6592
1 parent 832c914
commit 5fa6592
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
@@ -560,6 +560,10 @@ function setValues($db)
 		    $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 @@ function setValues($db)
 		}
 		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);