mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-25 19:16:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong mark-as-read maxId argument (#2431)

Browse Source 
Fix https://github.com/FreshRSS/FreshRSS/issues/2429
This commit is contained in:
Alexandre Alapetite
2019-06-29 20:47:38 +02:00
committed by GitHub
parent 9720ab6a4d
commit ad19b6bf2e
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/indexController.php
View File

@@ -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();

9
app/layout/nav_menu.phtml
View File

@@ -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' ) { ?>

5
app/views/index/global.phtml
View File

@@ -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) &&

5
app/views/index/normal.phtml
View File

@@ -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;

5
app/views/index/reader.phtml
View File

@@ -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;