mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 21:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

nextGet and idMax are coming back.

Browse Source 
See https://github.com/marienfressinaud/FreshRSS/issues/634
This commit is contained in:
Marien Fressinaud
2014-10-22 19:19:15 +02:00
parent 8a6ad05eba
commit 1fe5ed5d21
4 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Controllers/entryController.php
View File

@@ -17,14 +17,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
);
}
// Keep parameter information (output) to do a correct redirection at
// the end.
$this->params = array();
$output = Minz_Request::param('output', '');
if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
$this->params['output'] = $output;
}
// If ajax request, we do not print layout
$this->ajax = Minz_Request::param('ajax');
if ($this->ajax) {
@@ -53,6 +45,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
$get = Minz_Request::param('get');
$next_get = Minz_Request::param('nextGet', $get);
$id_max = Minz_Request::param('idMax', 0);
$params = array();
$entryDAO = FreshRSS_Factory::createEntryDao();
if ($id === false) {
@@ -86,7 +79,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
// Redirect to the correct page (category, feed or starred)
// Not "a" because it is the default value if nothing is
// given.
$this->params['get'] = $next_get;
$params['get'] = $next_get;
}
}
} else {
@@ -98,7 +91,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
Minz_Request::good(_t('feeds_marked_read'), array(
'c' => 'index',
'a' => 'index',
'params' => $this->params,
'params' => $params,
), true);
}
}
@@ -123,7 +116,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
Minz_Request::forward(array(
'c' => 'index',
'a' => 'index',
'params' => $this->params,
), true);
}
}