diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-15 18:41:49 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-10-15 18:41:49 +0200 |
| commit | 91e3711a87660c0222c237a2acc1f41e4552fa0f (patch) | |
| tree | df400f65ace85b53d97f8b31635f38b3d629c472 | |
| parent | 64d5d61910367b24be446c086a84aefb3aec0874 (diff) | |
| parent | 5e3a9480d1b6c5fab7444681547f00f38f4060be (diff) | |
Merge pull request #1319 from Alkarex/bug-auto-load-more
Fix bug auto load more
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rwxr-xr-x | app/views/helpers/pagination.phtml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d15c95069..546e5c0fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f) * Fix bug in Global view introduced in version 1.5.0 [#1269](https://github.com/FreshRSS/FreshRSS/pull/1269) * Fix sharing bug [#1289](https://github.com/FreshRSS/FreshRSS/issues/1289) + * Fix bug in auto-load more articles after marking an article as un-read [#1318](https://github.com/FreshRSS/FreshRSS/issues/1318) * Fix bug during import of favourites [#1315](https://github.com/FreshRSS/FreshRSS/pull/1315), [#1312](https://github.com/FreshRSS/FreshRSS/issues/1312) * Fix bug not respecting language option for new users [#1273](https://github.com/FreshRSS/FreshRSS/issues/1273) * Bug in example of URL for FreshRS RSS output with token [#1274](https://github.com/FreshRSS/FreshRSS/issues/1274) diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index 20957fc67..eb3114fcd 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -1,6 +1,7 @@ <?php $url_next = Minz_Request::currentRequest(); $url_next['params']['next'] = FreshRSS_Context::$next_id; + $url_next['params']['state'] = FreshRSS_Context::$state; $url_next['params']['ajax'] = 1; $url_mark_read = array( |