From 97ef33bb7296cea995b19932a95c6aaec7242dc6 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
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
---
 index.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index b9576de8..19d54db8 100644
--- a/index.php
+++ b/index.php
@@ -1675,10 +1675,7 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         $keys[] = $key;
     }
 
-    // If there is only a single link, we change on-the-fly the title of the page.
-    if (count($linksToDisplay) == 1) {
-        $conf->set('pagetitle', $linksToDisplay[$keys[0]]['title'] .' - '. $conf->get('general.title'));
-    }
+
 
     // Select articles according to paging.
     $pagecount = ceil(count($keys) / $_SESSION['LINKS_PER_PAGE']);
@@ -1740,9 +1737,10 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         'links' => $linkDisp,
         'tags' => $LINKSDB->allTags(),
     );
-    // FIXME! temporary fix - see #399.
-    if ($conf->exists('pagetitle') && count($linkDisp) == 1) {
-        $data['pagetitle'] = $conf->get('pagetitle');
+
+    // If there is only a single link, we change on-the-fly the title of the page.
+    if (count($linksToDisplay) == 1) {
+        $data['pagetitle'] = $linksToDisplay[$keys[0]]['title'] .' - '. $conf->get('general.title');
     }
 
     $pluginManager->executeHooks('render_linklist', $data, array('loggedin' => isLoggedIn()));
-- 
cgit v1.2.3