From 1dc52ae7b38157dd1aa6591868246ef42b0c71bb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 28 Mar 2011 12:17:40 +0400 Subject: [PATCH] pref-prefs: blacklist HEADLINES_SMART_DATE --- functions.php | 2 +- modules/pref-prefs.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index c31727ca3..dc162d7a9 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 b9cc24330..2dbd206a3 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",