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/normal.phtml | |
| 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/normal.phtml')
| -rw-r--r-- | app/views/index/normal.phtml | 7 |
1 files changed, 3 insertions, 4 deletions
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'); ?> |