diff options
| -rw-r--r-- | functions.php | 2 | ||||
| -rw-r--r-- | viewfeed.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functions.php b/functions.php index 572ecf105..00d2dcf20 100644 --- a/functions.php +++ b/functions.php @@ -3153,7 +3153,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", + "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT", "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST", "COMBINED_DISPLAY_MODE") as $param) { $params[strtolower($param)] = (int) get_pref($link, $param); diff --git a/viewfeed.js b/viewfeed.js index f06c99444..fff40375d 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -112,7 +112,7 @@ function headlines_callback2(transport, feed_cur_page) { vgroup_last_feed = headlines_info.vgroup_last_feed; - if (headlines_count == 0) { + if (parseInt(headlines_count) < getInitParam("default_article_limit")) { _infscroll_disable = 1; } else { _infscroll_disable = 0; |