From d9aba405dd84aa085b0497754f161713baf8327c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Dec 2014 10:09:47 +0100 Subject: [PATCH] Fix: utf must be default value. --- htdocs/core/lib/functions.lib.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a48b7e3caff..a831767d940 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1029,7 +1029,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e function dol_getdate($timestamp,$fast=false) { global $conf; - + $usealternatemethod=false; if ($timestamp <= 0) $usealternatemethod=true; // <= 1970 if ($timestamp >= 2145913200) $usealternatemethod=true; // >= 2038 @@ -1041,7 +1041,7 @@ function dol_getdate($timestamp,$fast=false) else { $arrayinfo=getdate($timestamp); - + $startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; if($startday==1) { @@ -1116,11 +1116,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) $default_timezone=@date_default_timezone_get(); } } - + 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); @@ -1788,6 +1788,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo { global $conf; + if (empty($stringencoding)) $stringencoding='UTF-8'; + if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; // We go always here