lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2017 from FHenry/3.6

Browse Source 
Fix problem on task creation with chrome for french browser.
This commit is contained in:
Laurent Destailleur 2014-11-15 12:10:49 +01:00
commit 314be02e65
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1053,7 +1053,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();
} }
} }
else $localtz = new DateTimeZone('UTC');
if (empty($localtz)) {
$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);

6
htdocs/user/fiche.php
View File

@ -1208,7 +1208,11 @@ else
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>'; 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"; print "</td></tr>\n";
// Hierarchy // Hierarchy