From 97ef33bb7296cea995b19932a95c6aaec7242dc6 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 19 Jul 2016 18:03:09 +0200 Subject: Fixes #600 - Shaarli's title is not set with the new config manager - Fixed title config key - Page title (in head tag) is no longer set through the config manager --- application/PageBuilder.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'application') diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 7cd88370..1ca0260a 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -68,18 +68,12 @@ class PageBuilder $this->tpl->assign('source', index_url($_SERVER)); $this->tpl->assign('version', shaarli_version); $this->tpl->assign('scripturl', index_url($_SERVER)); - $this->tpl->assign('pagetitle', 'Shaarli'); $this->tpl->assign('privateonly', !empty($_SESSION['privateonly'])); // Show only private links? - if ($this->conf->exists('general.title')) { - $this->tpl->assign('pagetitle', $this->conf->get('general.title')); - } + $this->tpl->assign('pagetitle', $this->conf->get('general.title', 'Shaarli')); if ($this->conf->exists('general.header_link')) { $this->tpl->assign('titleLink', $this->conf->get('general.header_link')); } - if ($this->conf->exists('pagetitle')) { - $this->tpl->assign('pagetitle', $this->conf->get('pagetitle')); - } - $this->tpl->assign('shaarlititle', $this->conf->get('title', 'Shaarli')); + $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('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); -- cgit v1.2.3