valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limit smart_date_time stuff to headlines only

This commit is contained in:
Andrew Dolgov 2015-07-03 23:36:47 +03:00
parent 46973af5df
commit b6714c77d2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -376,7 +376,7 @@ class Feeds extends Handler_Protected {
# $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" . # $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
# $line["title"] . "</a>"; # $line["title"] . "</a>";
$updated_fmt = make_local_datetime($line["updated"], false); $updated_fmt = make_local_datetime($line["updated"], false, false, false, true);
$date_entered_fmt = T_sprintf("Imported at %s", $date_entered_fmt = T_sprintf("Imported at %s",
make_local_datetime($line["date_entered"], false)); make_local_datetime($line["date_entered"], false));

8
include/functions.php
View File

@ -912,7 +912,7 @@
} }
function make_local_datetime($timestamp, $long, $owner_uid = false, function make_local_datetime($timestamp, $long, $owner_uid = false,
$no_smart_dt = false) { $no_smart_dt = false, $eta_min = false) {
if (!$owner_uid) $owner_uid = $_SESSION['uid']; if (!$owner_uid) $owner_uid = $_SESSION['uid'];
if (!$timestamp) $timestamp = '1970-01-01 0:00'; if (!$timestamp) $timestamp = '1970-01-01 0:00';
@ -946,7 +946,7 @@
if (!$no_smart_dt) { if (!$no_smart_dt) {
return smart_date_time($user_timestamp, return smart_date_time($user_timestamp,
$tz_offset, $owner_uid); $tz_offset, $owner_uid, $eta_min);
} else { } else {
if ($long) if ($long)
$format = get_pref('LONG_DATE_FORMAT', $owner_uid); $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
@ -957,10 +957,10 @@
} }
} }
function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false) { function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
if (!$owner_uid) $owner_uid = $_SESSION['uid']; if (!$owner_uid) $owner_uid = $_SESSION['uid'];
if (date("Y.m.d.G", $timestamp) == date("Y.m.d.G", time() + $tz_offset)) { if ($eta_min && date("Y.m.d.G", $timestamp) == date("Y.m.d.G", time() + $tz_offset)) {
return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp)); 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)) { } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
return date("G:i", $timestamp); return date("G:i", $timestamp);