diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-03-11 14:11:06 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-03-11 14:13:58 +0100 |
commit | 2ea89aba4faa5509ca68c7e9b6b9ab71c1929935 (patch) | |
tree | 6131fcd04c045d6949e97a00ee70ad6505ecb646 /application/PageBuilder.php | |
parent | 1739d6b314f410ee79d603f601f2845d55c48b4d (diff) | |
download | Shaarli-2ea89aba4faa5509ca68c7e9b6b9ab71c1929935.tar.gz Shaarli-2ea89aba4faa5509ca68c7e9b6b9ab71c1929935.tar.zst Shaarli-2ea89aba4faa5509ca68c7e9b6b9ab71c1929935.zip |
Fixes #304: use atom feed as default
RSS feed is still available with the setting set to false
Diffstat (limited to 'application/PageBuilder.php')
-rw-r--r-- | application/PageBuilder.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 544aba7c..b133dee8 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php | |||
@@ -75,7 +75,8 @@ class PageBuilder | |||
75 | } | 75 | } |
76 | $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli')); | 76 | $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli')); |
77 | $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); | 77 | $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); |
78 | $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); | 78 | $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', true)); |
79 | $this->tpl->assign('feed_type', $this->conf->get('feed.show_atom', true) !== false ? 'atom' : 'rss'); | ||
79 | $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); | 80 | $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); |
80 | $this->tpl->assign('token', getToken($this->conf)); | 81 | $this->tpl->assign('token', getToken($this->conf)); |
81 | // To be removed with a proper theme configuration. | 82 | // To be removed with a proper theme configuration. |