do not enable infscroll when number of loaded headlines is less than headline limit

diff --git a/functions.php b/functions.php
index 572ecf1058cb974b0466cd5016b627c08bd6054c..00d2dcf20745c44726e31295f5c7886958c2b801 100644 (file)
--- 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 f06c99444ecc85bdfcf2a8b7a7b9e72b3da05ebe..fff40375db5cf9430538e989ae2eee21ed5d19a9 100644 (file)
--- 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;