Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: utf must be default value.

Browse Source
This commit is contained in:
Laurent Destailleur
2014-12-18 10:09:47 +01:00
parent d98f36bd8f
commit d9aba405dd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/functions.lib.php
View File

@@ -1029,7 +1029,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
function dol_getdate($timestamp,$fast=false) function dol_getdate($timestamp,$fast=false)
{ {
global $conf; global $conf;
$usealternatemethod=false; $usealternatemethod=false;
if ($timestamp <= 0) $usealternatemethod=true; // <= 1970 if ($timestamp <= 0) $usealternatemethod=true; // <= 1970
if ($timestamp >= 2145913200) $usealternatemethod=true; // >= 2038 if ($timestamp >= 2145913200) $usealternatemethod=true; // >= 2038
@@ -1041,7 +1041,7 @@ function dol_getdate($timestamp,$fast=false)
else else
{ {
$arrayinfo=getdate($timestamp); $arrayinfo=getdate($timestamp);
$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; $startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
if($startday==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(); $default_timezone=@date_default_timezone_get();
} }
} }
if (empty($localtz)) { if (empty($localtz)) {
$localtz = new DateTimeZone('UTC'); $localtz = new DateTimeZone('UTC');
} }
$dt = new DateTime(null,$localtz); $dt = new DateTime(null,$localtz);
$dt->setDate($year,$month,$day); $dt->setDate($year,$month,$day);
$dt->setTime((int) $hour, (int) $minute, (int) $second); $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; global $conf;
if (empty($stringencoding)) $stringencoding='UTF-8';
if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
// We go always here // We go always here