mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +02:00
- the day of the week is not displayed when year is prior to 1970
git-svn-id: http://piwigo.org/svn/trunk@698 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -415,7 +415,7 @@ function format_date($date, $type = 'us', $show_time = false)
|
||||
}
|
||||
$formated_date = '';
|
||||
// before 1970, Microsoft Windows can't mktime
|
||||
if ($year >= 1970 or substr(PHP_OS, 0, 3) != 'WIN')
|
||||
if ($year >= 1970)
|
||||
{
|
||||
// we ask midday because Windows think it's prior to midnight with a
|
||||
// zero and refuse to work
|
||||
|
||||
@@ -647,11 +647,14 @@ SELECT COUNT(DISTINCT(id)) AS count
|
||||
$page['title'] .= ' (';
|
||||
if (isset($page['calendar_day']))
|
||||
{
|
||||
$unixdate = mktime(0,0,0,
|
||||
$page['calendar_month'],
|
||||
$page['calendar_day'],
|
||||
$page['calendar_year']);
|
||||
$page['title'].= $lang['day'][date("w", $unixdate)];
|
||||
if ($page['calendar_year'] >= 1970)
|
||||
{
|
||||
$unixdate = mktime(0,0,0,
|
||||
$page['calendar_month'],
|
||||
$page['calendar_day'],
|
||||
$page['calendar_year']);
|
||||
$page['title'].= $lang['day'][date("w", $unixdate)];
|
||||
}
|
||||
$page['title'].= ' '.$page['calendar_day'].', ';
|
||||
}
|
||||
if (isset($page['calendar_month']))
|
||||
|
||||
Reference in New Issue
Block a user