From 24ad67e0e1e0440cf003c299b9ef46051619aba4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Sep 2019 20:01:57 +0200
Subject: [PATCH] Fix missing $conf

---
 htdocs/core/lib/functions.lib.php        | 2 +-
 htdocs/core/modules/modHoliday.class.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0596b79c92b..44e038eef48 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4558,7 +4558,7 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
  * Output a dimension with best unit
  *
  * @param   float       $dimension      Dimension
- * @param   int         $unit           Unit of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...)
+ * @param   int         $unit           Unit scale of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...)
  * @param   string      $type           'weight', 'volume', ...
  * @param   Translate   $outputlangs    Translate language object
  * @param   int         $round          -1 = non rounding, x = number of decimal
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 2fd98887b87..5d23af70ba4 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -43,6 +43,8 @@ class modHoliday extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
+		global $conf, $user;   // Required by some include code
+
 		$this->db = $db;
 
 		// Id for module (must be unique).