diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-09 21:32:06 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-09 21:32:06 +0200 |
| commit | fce624218eb247d7174cdb186026174a8a6e5e8b (patch) | |
| tree | f399b3bd6264d9c0f5f9597e3055adab532314b0 /app/layout | |
| parent | b6e89d4e06814541802c428c4df0e28633f551cd (diff) | |
| parent | d477373ef2879bdeeaa3c157287c0fab98afefdc (diff) | |
Merge branch 'dev' into 411-update-system
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_flux.phtml | 2 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index cc04e757c..aee8f8754 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -1,4 +1,4 @@ -<div class="aside aside_flux<?php if (($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux"> +<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux"> <a class="toggle_aside" href="#close"><?php echo FreshRSS_Themes::icon('close'); ?></a> <ul class="categories"> diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 29ea9032c..73a921c5d 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -221,7 +221,9 @@ <?php $url_output['params']['output'] = 'rss'; - $url_output['params']['token'] = $this->conf->token; + if ($this->conf->token) { + $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'); ?> |