archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved issue 0000900: format_date function doesn't work when time is omitted with 'mysql_datetime' type

Browse source 
Continue correction of grum

git-svn-id: http://piwigo.org/svn/trunk@2856 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2008-11-09 21:44:44 +00:00
parent 1ddabfb681
commit 2a804c8b21
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/category_default.inc.php
View file

@ -117,7 +117,7 @@ foreach ($pictures as $row)
'FILE_PATH' => $row['path'], 'FILE_PATH' => $row['path'],
'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'), 'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'),
'FILE_CREATED' => (empty($row['date_creation'])) ? 'FILE_CREATED' => (empty($row['date_creation'])) ?
'-': format_date($row['date_creation'], 'us'), '-': format_date($row['date_creation'], 'mysql_date'),
'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'], 'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'],
'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'], 'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'],
'FILE_HIT' => $row['hit'], 'FILE_HIT' => $row['hit'],
@ -125,7 +125,7 @@ foreach ($pictures as $row)
'FILE_WIDTH' => (empty($row['width'])) ? '-' : $row['width'], 'FILE_WIDTH' => (empty($row['width'])) ? '-' : $row['width'],
'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'], 'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'],
'FILE_METADATE' => (empty($row['date_metadata_update'])) ? 'FILE_METADATE' => (empty($row['date_metadata_update'])) ?
'-': format_date($row['date_metadata_update'], 'us'), '-': format_date($row['date_metadata_update'], 'mysql_date'),
'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'], 'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'],
'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ? 'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
true:false, /* lack of include/functions_picture.inc.php */ true:false, /* lack of include/functions_picture.inc.php */

8
include/functions.inc.php
View file

@ -601,6 +601,14 @@ function format_date($date, $type = 'us', $show_time = false)
array($out[1],$out[2],$out[3],$out[4],$out[5],$out[6]); array($out[1],$out[2],$out[3],$out[4],$out[5],$out[6]);
break; break;
} }
case 'mysql_date' :
{
preg_match('/^(\d{4})-(\d{2})-(\d{2})$/',
$date, $out);
list($year,$month,$day) =
array($out[1],$out[2],$out[3]);
break;
}
} }
$formated_date = ''; $formated_date = '';
// before 1970, Microsoft Windows can't mktime // before 1970, Microsoft Windows can't mktime