From ad19b6bf2ec9e2974ff8382fabbd209ae1e4eab7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 29 Jun 2019 20:47:38 +0200
Subject: Fix wrong mark-as-read maxId argument (#2431)

Fix https://github.com/FreshRSS/FreshRSS/issues/2429
---
 app/Controllers/indexController.php | 2 +-
 app/layout/nav_menu.phtml           | 9 ++++++++-
 app/views/index/global.phtml        | 5 -----
 app/views/index/normal.phtml        | 5 -----
 app/views/index/reader.phtml        | 5 -----
 5 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'app')

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 824d65815..f536113dd 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -54,7 +54,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			}
 		};
 
-		$this->view->callbackBeforeEntries = function ($view) {
+		$this->view->callbackBeforePagination = function ($view) {
 			try {
 				FreshRSS_Context::$number++;	//+1 for pagination
 				$entries = FreshRSS_index_Controller::listEntriesByContext();
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 4d860a54c..af7267bac 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -1,4 +1,11 @@
-<?php $actual_view = Minz_Request::actionName(); ?>
+<?php
+	$actual_view = Minz_Request::actionName();
+
+	flush();
+	if (isset($this->callbackBeforePagination)) {
+		call_user_func($this->callbackBeforePagination, $this);
+	}
+?>
 
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal' || $actual_view === 'reader' ) { ?>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 3566abe7e..2f25b6dc2 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -1,11 +1,6 @@
 <?php
 	$this->partial('nav_menu');
 
-	flush();
-	if (isset($this->callbackBeforeEntries)) {
-		call_user_func($this->callbackBeforeEntries, $this);
-	}
-
 	$class = '';
 	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
 			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index d5ae8e2f9..ac2ea812d 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -3,11 +3,6 @@
 $this->partial('aside_feed');
 $this->partial('nav_menu');
 
-flush();
-if (isset($this->callbackBeforeEntries)) {
-	call_user_func($this->callbackBeforeEntries, $this);
-}
-
 if (!empty($this->entries)) {
 	$display_today = true;
 	$display_yesterday = true;
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index fbe37d2e3..129fae937 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -2,11 +2,6 @@
 $this->partial('aside_feed');
 $this->partial('nav_menu');
 
-flush();
-if (isset($this->callbackBeforeEntries)) {
-	call_user_func($this->callbackBeforeEntries, $this);
-}
-
 if (!empty($this->entries)) {
 	$lazyload = FreshRSS_Context::$user_conf->lazyload;
 	$content_width = FreshRSS_Context::$user_conf->content_width;
-- 
cgit v1.2.3