From c0a3606a595fa21a015ef262ce98fd0e32453412 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 12 Nov 2014 22:53:23 +0100
Subject: [PATCH 1/2] Fix problem on task creation with chrome for french
 browser.

---
 htdocs/core/lib/functions.lib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e238b1e5834..d679882161f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1053,7 +1053,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
-		else $localtz = new DateTimeZone('UTC');
+		
+		if (empty($localtz)) {
+			$localtz = new DateTimeZone('UTC');
+		}
+		
 		$dt = new DateTime(null,$localtz);
 		$dt->setDate($year,$month,$day);
 		$dt->setTime((int) $hour, (int) $minute, (int) $second);

From 00c6033e11b35d5f004fddacd82f3f3464d1ea9e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 14 Nov 2014 13:28:49 +0100
Subject: [PATCH 2/2] Fix display user signature when WYSIWYG is enabled

---
 htdocs/user/fiche.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index a0523bcbc28..9b1845d6bff 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1208,7 +1208,11 @@ else
 
             // Signature
             print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
-            print dol_htmlentitiesbr($object->signature);
+            if (empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
+            	print dol_htmlentitiesbr($object->signature);
+            } else {
+            	print $object->signature;
+            }
             print "</td></tr>\n";
 
             // Hierarchy