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

Fix: Supprime nombreux warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2007-10-29 12:54:25 +00:00
parent a76c63e096
commit 8ef2bb9f0b
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/lib/functions.inc.php
View File

@@ -520,8 +520,8 @@ function dolibarr_print_date($time,$format='')
{
global $conf;
// Si format non d<>fini, on prend $conf->format_date_text_short
if (! $format) $format=$conf->format_date_text_short;
// Si format non d<>fini, on prend $conf->format_date_text_short sinon %Y-%m-%d %H:%M:%S
if (! $format) $format=(isset($conf->format_date_text_short) ? $conf->format_date_text_short : '%Y-%m-%d %H:%M:%S');
if ($format == 'day') $format=$conf->format_date_short;
if ($format == 'hour') $format=$conf->format_hour_short;
@@ -529,10 +529,9 @@ function dolibarr_print_date($time,$format='')
if ($format == 'dayhour') $format=$conf->format_date_hour_short;
if ($format == 'dayhourtext') $format=$conf->format_date_hour_text_short;
if ($format == 'dayhourldap') $format='%Y%m%d%H%M%SZ';
if (! $format) $format='%Y-%m-%d %H:%M:%S';
// Si date non d<>finie, on renvoie ''
if ($time == "") return ''; // $time=0 permis car signifie 01/01/1970 00:00:00
if ($time == '') return ''; // $time=0 permis car signifie 01/01/1970 00:00:00
// Analyse de la date
if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?',$time,$reg))