summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-04-02 15:32:47 +0400
committerAndrew Dolgov <[email protected]>2013-04-02 15:32:47 +0400
commitf17cac6b26c4df018e8fda97925411d8267c1310 (patch)
tree13bcd65ee9c3b1fdc4757340ccdee06224710bf5 /include
parent4b7726f0b44db36ad12c0a0918a9129c8cbb1caa (diff)
retire DEFAULT_ARTICLE_LIMIT, infinite scrolling is fast enough to make it superfluous
Diffstat (limited to 'include')
-rw-r--r--include/db-prefs.php4
-rw-r--r--include/functions.php2
2 files changed, 1 insertions, 5 deletions
diff --git a/include/db-prefs.php b/include/db-prefs.php
index f6a78939b..1ee3d609a 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -166,10 +166,6 @@
$value = sprintf("%d", $value);
}
- if ($pref_name == 'DEFAULT_ARTICLE_LIMIT' && $value == 0) {
- $value = 30;
- }
-
if ($pref_name == 'USER_TIMEZONE' && $value == '') {
$value = 'UTC';
}
diff --git a/include/functions.php b/include/functions.php
index c04e6a81a..92690cfbb 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1840,7 +1840,7 @@
foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
"ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
- "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
+ "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
"HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
$params[strtolower($param)] = (int) get_pref($link, $param);