diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 14:18:32 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 14:18:32 +0100 |
| commit | 73023bc12b81a27045703e1f733faeb2b4e02cec (patch) | |
| tree | 14aca1a1953d0a813c06794e48a63738abccdcea /app/views/index | |
| parent | 26da4aa448906f857a252507b34d369a386043c6 (diff) | |
| parent | 0e4e16ac55097aa173c7c439367294ebd7645562 (diff) | |
Merge branch 'dev' into 252-extensions
Conflicts:
app/FreshRSS.php
app/Models/Configuration.php
app/views/index/index.phtml
app/views/index/normal.phtml
lib/Minz/Configuration.php
lib/Minz/Translate.php
lib/lib_rss.php
Diffstat (limited to 'app/views/index')
| -rw-r--r-- | app/views/index/global.phtml | 4 | ||||
| -rw-r--r-- | app/views/index/normal.phtml | 7 | ||||
| -rw-r--r-- | app/views/index/reader.phtml | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index ae7f5ffbc..cf95bd0f5 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -2,7 +2,7 @@ $this->partial('nav_menu'); $class = ''; - if (FreshRSS_Context::$conf->hide_read_feeds && + if (FreshRSS_Context::$user_conf->hide_read_feeds && FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) { $class = ' state_unread'; @@ -50,5 +50,5 @@ <div id="overlay"> <a class="close" href="#"><?php echo _i('close'); ?></a> </div> -<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>> +<div id="panel"<?php echo FreshRSS_Context::$user_conf->display_posts ? '' : ' class="hide_posts"'; ?>> </div> diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index 817732c2c..f71abf158 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -7,10 +7,9 @@ if (!empty($this->entries)) { $display_today = true; $display_yesterday = true; $display_others = true; - $hidePosts = !FreshRSS_Context::$conf->display_posts; - $lazyload = FreshRSS_Context::$conf->lazyload; - - $content_width = FreshRSS_Context::$conf->content_width; + $hidePosts = !FreshRSS_Context::$user_conf->display_posts; + $lazyload = FreshRSS_Context::$user_conf->lazyload; + $content_width = FreshRSS_Context::$user_conf->content_width; $today = @strtotime('today'); ?> diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml index ae65a72d2..a19ee322e 100644 --- a/app/views/index/reader.phtml +++ b/app/views/index/reader.phtml @@ -2,8 +2,8 @@ $this->partial('nav_menu'); if (!empty($this->entries)) { - $lazyload = FreshRSS_Context::$conf->lazyload; - $content_width = FreshRSS_Context::$conf->content_width; + $lazyload = FreshRSS_Context::$user_conf->lazyload; + $content_width = FreshRSS_Context::$user_conf->content_width; ?> <div id="stream" class="reader"><?php |