From 2ea89aba4faa5509ca68c7e9b6b9ab71c1929935 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Mar 2017 14:11:06 +0100 Subject: Fixes #304: use atom feed as default RSS feed is still available with the setting set to false --- application/PageBuilder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/PageBuilder.php') 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 } $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli')); $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); - $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); + $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', true)); + $this->tpl->assign('feed_type', $this->conf->get('feed.show_atom', true) !== false ? 'atom' : 'rss'); $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); $this->tpl->assign('token', getToken($this->conf)); // To be removed with a proper theme configuration. -- cgit v1.2.3