diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-01 09:27:47 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-01 09:27:47 +0200 |
| commit | 41c11028d9928404ef9a45d2314db89a68f210cd (patch) | |
| tree | 3f2a9a6d4080e1b9289d49e8c6d77575c4e57d1c | |
| parent | c16a973d453078a037a2a6a6e8e3d17ffd3bf2e6 (diff) | |
| parent | 8a58795e7dfd501c6c8ac84694e695c4f0791cfb (diff) | |
Merge branch 'FreshRSS/dev' into PostgreSQL
| -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 e88daba93..40b4df1f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,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) { |