diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-05 22:43:15 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-05 22:45:03 +0100 |
| commit | 7cca47d1ab5838f5440b1a1e08fa4c0d43989664 (patch) | |
| tree | b51ae930a11afd4c9622c27c1926310f980d294e /app/views/index/normal.phtml | |
| parent | 51a71ec4b9d62528054be8faee1576a8fd6d37f6 (diff) | |
Change name of user configuration var in Context
- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf
- Introduce FreshRSS_Context::$system_conf
- Remove FreshRSS_Configuration object
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/views/index/normal.phtml')
| -rw-r--r-- | app/views/index/normal.phtml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index b8a78cc3d..c2cf7c887 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -8,24 +8,24 @@ if (!empty($this->entries)) { $display_yesterday = true; $display_others = true; if (FreshRSS_Auth::hasAccess()) { - $sharing = FreshRSS_Context::$conf->sharing; + $sharing = FreshRSS_Context::$user_conf->sharing; } else { $sharing = array(); } - $hidePosts = !FreshRSS_Context::$conf->display_posts; - $lazyload = FreshRSS_Context::$conf->lazyload; - $topline_read = FreshRSS_Context::$conf->topline_read; - $topline_favorite = FreshRSS_Context::$conf->topline_favorite; - $topline_date = FreshRSS_Context::$conf->topline_date; - $topline_link = FreshRSS_Context::$conf->topline_link; - $bottomline_read = FreshRSS_Context::$conf->bottomline_read; - $bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite; - $bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing)); - $bottomline_tags = FreshRSS_Context::$conf->bottomline_tags; - $bottomline_date = FreshRSS_Context::$conf->bottomline_date; - $bottomline_link = FreshRSS_Context::$conf->bottomline_link; + $hidePosts = !FreshRSS_Context::$user_conf->display_posts; + $lazyload = FreshRSS_Context::$user_conf->lazyload; + $topline_read = FreshRSS_Context::$user_conf->topline_read; + $topline_favorite = FreshRSS_Context::$user_conf->topline_favorite; + $topline_date = FreshRSS_Context::$user_conf->topline_date; + $topline_link = FreshRSS_Context::$user_conf->topline_link; + $bottomline_read = FreshRSS_Context::$user_conf->bottomline_read; + $bottomline_favorite = FreshRSS_Context::$user_conf->bottomline_favorite; + $bottomline_sharing = FreshRSS_Context::$user_conf->bottomline_sharing && (count($sharing)); + $bottomline_tags = FreshRSS_Context::$user_conf->bottomline_tags; + $bottomline_date = FreshRSS_Context::$user_conf->bottomline_date; + $bottomline_link = FreshRSS_Context::$user_conf->bottomline_link; - $content_width = FreshRSS_Context::$conf->content_width; + $content_width = FreshRSS_Context::$user_conf->content_width; $today = @strtotime('today'); ?> @@ -142,11 +142,11 @@ if (!empty($this->entries)) { <li class="dropdown-close"><a href="#close">❌</a></li> <?php foreach ($sharing as $share) { - $type_share = FreshRSS_Context::$conf->shares[$share['type']]; + $type_share = FreshRSS_Context::$user_conf->shares[$share['type']]; $has_specific_title = ($type_share['form'] === 'advanced'); ?> <li class="item share"> - <a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>"> + <a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$user_conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>"> <?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?> </a> </li> |