From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 3 Jul 2015 20:36:47 +0000 (+0300)
Subject: limit smart_date_time stuff to headlines only
X-Git-Tag: 16.3~263
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b6714c77d2f94e9aa847b12d19dfe4897e559088;p=tt-rss.git

limit smart_date_time stuff to headlines only
---

diff --git a/classes/feeds.php b/classes/feeds.php
index 9dccdbc8..bedfe649 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -376,7 +376,7 @@ class Feeds extends Handler_Protected {
 #				$content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
 #					$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",
 					make_local_datetime($line["date_entered"], false));
 
diff --git a/include/functions.php b/include/functions.php
index 84c1e35f..22179e1a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -912,7 +912,7 @@
 	}
 
 	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 (!$timestamp) $timestamp = '1970-01-01 0:00';
@@ -946,7 +946,7 @@
 
 		if (!$no_smart_dt) {
 			return smart_date_time($user_timestamp,
-				$tz_offset, $owner_uid);
+				$tz_offset, $owner_uid, $eta_min);
 		} else {
 			if ($long)
 				$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 (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));
 		} else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
 			return date("G:i", $timestamp);