diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-09-29 22:51:31 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-09-29 22:51:31 +0200 |
| commit | 8a58795e7dfd501c6c8ac84694e695c4f0791cfb (patch) | |
| tree | 14f9cea993284ff461a36a61cb8ff53f0f84327d | |
| parent | 1d87ebe9dd607a8e4da395d102763b62a94ac02b (diff) | |
| parent | b1a16f985cabeb67ff58fa16951aa49ca96c2c4a (diff) | |
Merge pull request #1269 from Alkarex/fix-global-view
Fix global view
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/views/index/global.phtml | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f13922837..1c2d47586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241) * Bug fixing * 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) * SimplePie * Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264) * Security diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index 1e53e4f8c..f35732c8f 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -11,10 +11,13 @@ <div id="stream" class="global<?php echo $class; ?>"> <?php + $params = Minz_Request::fetchGET(); + unset($params['c']); + unset($params['a']); $url_base = array( 'c' => 'index', 'a' => 'normal', - 'params' => Minz_Request::fetchGET(), + 'params' => $params, ); foreach ($this->categories as $cat) { |