summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-03-28 12:17:40 +0400
committerAndrew Dolgov <[email protected]>2011-03-28 12:17:40 +0400
commit1dc52ae7b38157dd1aa6591868246ef42b0c71bb (patch)
tree27e0d7383c4848bd37fb3cf2785b8511b8605cf5
parentef1805f8b7ed5c39f7998564d139f7a817dd2ab3 (diff)
pref-prefs: blacklist HEADLINES_SMART_DATE
-rw-r--r--functions.php2
-rw-r--r--modules/pref-prefs.php3
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",