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

Fix: dont view hour and minute if value is null

Browse Source
This commit is contained in:
Regis Houssin 2009-10-29 07:53:33 +00:00
parent ae3b3cd281
commit 084afa6a7f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/lib/date.lib.php
View File

@ -49,7 +49,7 @@ function ConvertSecondToTime($iSecond,$format='all')
if ($format == 'all') if ($format == 'all')
{ {
if ($iSecond > 86400) if ($iSecond >= 86400)
{ {
$sDay=date("d",$iSecond)-1; $sDay=date("d",$iSecond)-1;
$dayTranslate = $langs->trans("Day"); $dayTranslate = $langs->trans("Day");
@ -57,11 +57,19 @@ function ConvertSecondToTime($iSecond,$format='all')
} }
$sTime=''; $sTime='';
if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' '; if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' ';
$sTime.=date("H",$iSecond)-1; $sHour = date("H",$iSecond)-1;
$sTime.='h'.date("i",$iSecond); $sMin = date("i",$iSecond);
}else if ($format == 'hour'){ if (!empty($sHour) && !empty($sMin))
{
$sTime.= $sHour.'h'.$sMin;
}
}
else if ($format == 'hour')
{
$sTime=date("H",$iSecond)-1; $sTime=date("H",$iSecond)-1;
}else if ($format == 'min'){ }
else if ($format == 'min')
{
$sTime=date("i",$iSecond); $sTime=date("i",$iSecond);
} }
return $sTime; return $sTime;