pref-prefs: blacklist HEADLINES_SMART_DATE

diff --git a/functions.php b/functions.php
index c31727ca395b35b2c53573e313976b6d0c953d08..dc162d7a904f7b98b8b2588e732105810b9263a0 100644 (file)
--- 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 b9cc24330e75cae3922eda3d5bd893759a2043c2..2dbd206a3327707bc20b041b12871e8836b126d1 100644 (file)
--- 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",