public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 11:05:55 +00:00
Code Issues Releases Wiki Activity

Merge branch '12htime' of Fmstrat/tt-rss into master

Browse Source
This commit is contained in:
fox
2019-02-02 11:15:37 +00:00
committed by Gogs
parent 26ac57b092 5ac1935db5
commit 856e0c32eb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions.php
View File

@@ -951,7 +951,11 @@
if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
} else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
return date("G:i", $timestamp);
$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
if (strpos((strtolower($format)), "a") === false)
return date("G:i", $timestamp);
else
return date("g:i a", $timestamp);
} else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
return date($format, $timestamp);