Skip to content

Commit

Permalink
Merge pull request #1707 from FHenry/3.6
Browse files Browse the repository at this point in the history
avoid warning message on preg_replace
  • Loading branch information
eldy committed Jul 4, 2014
2 parents 7d519fd + cdfe881 commit fa84409
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions htdocs/main.inc.php
Expand Up @@ -447,9 +447,9 @@ function analyse_sql_and_script(&$var, $type)
$dol_authmode=$conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
$dol_tz=$_POST["tz"];
$dol_tz_string=$_POST["tz_string"];
$dol_tz_string=preg_replace('\s*\(.+\)$','',$dol_tz_string);
$dol_tz_string=preg_replace(',','/',$dol_tz_string);
$dol_tz_string=preg_replace('\s','_',$dol_tz_string);
$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
$dol_tz_string=preg_replace('/,/' ,'/',$dol_tz_string);
$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
$dol_dst=0;
if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
{
Expand Down

0 comments on commit fa84409

Please sign in to comment.