diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-03-21 20:10:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 20:10:49 +0100 |
| commit | c4c655d9bfe68a914898d76bb9c479eea1b04f72 (patch) | |
| tree | f3c681508a588d516e50b33581b6e4b6e90f7326 /application/PageBuilder.php | |
| parent | 4bad4bde5a2b8dcbb00e95662e30b4694fe97266 (diff) | |
| parent | 2ea89aba4faa5509ca68c7e9b6b9ab71c1929935 (diff) | |
| download | Shaarli-c4c655d9bfe68a914898d76bb9c479eea1b04f72.tar.gz Shaarli-c4c655d9bfe68a914898d76bb9c479eea1b04f72.tar.zst Shaarli-c4c655d9bfe68a914898d76bb9c479eea1b04f72.zip | |
Merge pull request #804 from ArthurHoaro/feature/atom-default
Fixes #304: use atom feed as default
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. |