diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-13 18:33:52 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-13 18:33:52 +0200 |
| commit | 61f4d5457818204eb28ed394d4f1b97160542baa (patch) | |
| tree | e1629da3361235d1c4ef28944624326491628045 /app | |
| parent | 76b21e5e61f35321dd723f54db8ab271f2953495 (diff) | |
Fix problem token
Token was visible in all URLs of nav menu
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/indexController.php | 4 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 3445c0bd4..c843748c3 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -29,9 +29,7 @@ class FreshRSS_index_Controller extends Minz_ActionController { if (isset ($params['search'])) { $params['search'] = urlencode ($params['search']); } - if (!Minz_Configuration::allowAnonymous()) { - $params['token'] = $token; - } + $this->view->url = array ( 'c' => 'index', 'a' => 'index', diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 1114d0060..b42f816b4 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -186,7 +186,10 @@ <?php echo FreshRSS_Themes::icon("view-reader"); ?> </a> - <?php $url_output['params']['output'] = 'rss'; ?> + <?php + $url_output['params']['output'] = 'rss'; + $url_output['params']['token'] = $this->conf->token; + ?> <a class="view_rss btn" target="_blank" title="<?php echo Minz_Translate::t ('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>"> <?php echo FreshRSS_Themes::icon('rss'); ?> </a> |