Skip to content
Snippets Groups Projects
Commit db0a45d7 authored by aspangaro's avatar aspangaro
Browse files

Merge branch 'upstream/develop'

parents 74d3fdae 32c81588
Branches
Tags
No related merge requests found
...@@ -683,7 +683,7 @@ class DoliDBSqlite extends DoliDB ...@@ -683,7 +683,7 @@ class DoliDBSqlite extends DoliDB
* @param int $gm 1=Input informations are GMT values, otherwise local to server TZ * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ
* @return date Date TMS * @return date Date TMS
*/ */
function jdate($string, $gmt=false) function jdate($string, $gm=false)
{ {
$string=preg_replace('/([^0-9])/i','',$string); $string=preg_replace('/([^0-9])/i','',$string);
$tmp=$string.'000000'; $tmp=$string.'000000';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment