From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 28 Mar 2011 08:17:40 +0000 (+0400)
Subject: pref-prefs: blacklist HEADLINES_SMART_DATE
X-Git-Tag: 1.5.3~106
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1dc52ae7b38157dd1aa6591868246ef42b0c71bb;p=tt-rss.git

pref-prefs: blacklist HEADLINES_SMART_DATE
---

diff --git a/functions.php b/functions.php
index c31727ca..dc162d7a 100644
--- a/functions.php
+++ b/functions.php
@@ -2190,7 +2190,7 @@
 		$dt = new DateTime($timestamp, new DateTimeZone('UTC'));
 		$user_timestamp = $dt->format('U') + $user_tz->getOffset($dt);
 
-		if (!$no_smart_dt && get_pref($link, 'HEADLINES_SMART_DATE', $owner_uid)) {
+		if (!$no_smart_dt) {
 			return smart_date_time($link, $user_timestamp,
 				$user_tz->getOffset($dt), $owner_uid);
 		} else {
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index b9cc2433..2dbd206a 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -8,7 +8,8 @@
 		$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
 			"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS",
 			"ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST", "FEEDS_SORT_BY_UNREAD",
-			"OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL", "ENABLE_FLASH_PLAYER");
+			"OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL", "ENABLE_FLASH_PLAYER",
+			"HEADLINES_SMART_DATE");
 
 		$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
 			"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",