bug 2646 fixed: avoid useless PHP warnings with uncompleted creation date

git-svn-id: http://piwigo.org/svn/trunk@15573 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2012-06-05 22:55:57 +00:00
parent 5136cffb4e
commit 1dfe8d5645
+12 -3
View File
@@ -491,14 +491,23 @@ function format_date($date, $show_time = false, $show_day_name = true)
$formated_date = '';
// before 1970, Microsoft Windows can't mktime
if ($show_day_name and $ymdhms[0] >= 1970)
if ($ymdhms[0] >= 1970 and $ymdhms[1] != 0 and $ymdhms[2] != 0)
{
// we ask midday because Windows think it's prior to midnight with a
// zero and refuse to work
$formated_date.= $lang['day'][date('w', mktime(12,0,0,$ymdhms[1],$ymdhms[2],$ymdhms[0]))];
}
$formated_date.= ' '.$ymdhms[2];
$formated_date.= ' '.$lang['month'][(int)$ymdhms[1]];
if ($ymdhms[2] != 0)
{
$formated_date.= ' '.$ymdhms[2];
}
if ($ymdhms[1] != 0)
{
$formated_date.= ' '.$lang['month'][(int)$ymdhms[1]];
}
$formated_date.= ' '.$ymdhms[0];
if ($show_time and count($ymdhms)>=5 )
{