Merge branch 'patch-1' of github.com:Alkarex/FreshRSS into Alkarex-patch-doublon-autochargement

1 files changed, 6 insertions, 4 deletions

diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index d50cd751d..dd17fce36 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -143,16 +143,18 @@ function next_entry() {
 	last_active = $(".flux:last");
 	new_active = old_active.nextAll (".flux:first");
 
-	if(last_active.attr("id") == new_active.attr("id")) {
-		load_more_posts ();
-	}
-
 	if (new_active.hasClass("flux")) {
 		toggleContent (new_active, old_active);
 	} else if (old_active[0] === undefined &&
 	           new_active[0] === undefined) {
 		toggleContent (first_active, old_active);
 	}
+
+	<?php if ($auto_load_more !== 'yes') { ?>
+	if(last_active.attr("id") == new_active.attr("id")) {
+		load_more_posts ();
+	}
+	<?php } ?>
 }
 
 function init_img () {