Merge pull request #693 from electerious/develop

* Show captured time in info panel
This commit is contained in:
Fly Man 2018-02-24 01:07:32 +01:00
parent 3c07cadb17
commit ab0f86f5fb
No known key found for this signature in database
GPG Key ID: 2DDA5DB4F6486124

View File

@ -709,7 +709,7 @@ final class Photo {
// Parse photo // Parse photo
$photo['sysdate'] = strftime('%d %b. %Y', substr($photo['id'], 0, -4)); $photo['sysdate'] = strftime('%d %b. %Y', substr($photo['id'], 0, -4));
if (strlen($photo['takestamp'])>1) $photo['takedate'] = strftime('%d %b. %Y', $photo['takestamp']); if (strlen($photo['takestamp'])>1) $photo['takedate'] = strftime('%d %b. %Y %T', $photo['takestamp']);
// Parse medium // Parse medium
if ($photo['medium']==='1') $photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $photo['url']; if ($photo['medium']==='1') $photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $photo['url'];