X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FPageBuilder.php;h=32c7f9f18b01ba131be61bb778dc3d7a9239b727;hb=17c9ac7c35754b607dba2db74b4aa69d1cec335c;hp=7cd883703eb453b54a1e94c9e5d9ccd11f7e51b5;hpb=b302c77c74a09cb271b711248b8f433555524ef0;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 7cd88370..32c7f9f1 100644
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -68,24 +68,16 @@ 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));
-        if (!empty($GLOBALS['plugin_errors'])) {
-            $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
-        }
+        $this->tpl->assign('token', getToken($this->conf));
         // To be removed with a proper theme configuration.
         $this->tpl->assign('conf', $this->conf);
     }