5 files changed, 13 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 75c54f28..52d20090 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Shaarli, the personal, minimalist, super-fast, no-database delicious clone.
+# The personal, minimalist, super-fast, database free, bookmarking service.
 # Makefile for PHP code analysis & testing
 
 # Prerequisites:
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));
diff --git a/index.php b/index.php
index b9576de8..55b12adc 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  * Shaarli v0.7.0 - Shaare your links...
  *
- * The personal, minimalist, super-fast, no-database Delicious clone.
+ * The personal, minimalist, super-fast, database free, bookmarking service.
  *
  * Friendly fork by the Shaarli community:
  *  - https://github.com/shaarli/Shaarli
@@ -1159,6 +1159,7 @@ function renderPage($conf, $pluginManager)
             $PAGE->assign('timezone_form', $timezone_form);
             $PAGE->assign('timezone_js',$timezone_js);
             $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false));
+            $PAGE->assign('session_protection_disabled', $conf->get('security.session_protection_disabled', false));
             $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false));
             $PAGE->assign('enable_update_check', $conf->get('updates.check_updates', true));
             $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false));
@@ -1675,10 +1676,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 +1738,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()));
diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index 4bf53b2d..05862372 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -184,9 +184,9 @@ class UrlTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test IndToAscii.
+     * Test International Domain Name to ASCII conversion
      */
-    function testIndToAscii()
+    function testIdnToAscii()
     {
         $ind = 'http://www.académie-française.fr/';
         $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/';
diff --git a/tpl/configure.html b/tpl/configure.html
index ad9a2085..983bcd08 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -36,7 +36,7 @@
         <td><b>Security:</b></td>
         <td>
           <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection"
-                   {if="$private_links_default"}checked{/if}>
+                   {if="$session_protection_disabled"}checked{/if}>
           <label
             for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get
             disconnected often or if your IP address changes often.)</label>