2 files changed, 14 insertions, 20 deletions

diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index 85e1d59d..471724c0 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -158,10 +158,6 @@ class PageBuilder
      */
     protected function finalize(): void
     {
-        //FIXME - DEV _ REMOVE ME
-        $this->assign('base_path', '/Shaarli');
-        $this->assign('asset_path', '/Shaarli/tpl/default');
-
         // TODO: use the SessionManager
         $messageKeys = [
             SessionManager::KEY_SUCCESS_MESSAGES,
@@ -248,20 +244,4 @@ class PageBuilder
 
         return $this->tpl->draw($page, true);
     }
-
-    /**
-     * Render a 404 page (uses the template : tpl/404.tpl)
-     * usage: $PAGE->render404('The link was deleted')
-     *
-     * @param string $message A message to display what is not found
-     */
-    public function render404($message = '')
-    {
-        if (empty($message)) {
-            $message = t('The page you are trying to reach does not exist or has been deleted.');
-        }
-        header($_SERVER['SERVER_PROTOCOL'] . ' ' . t('404 Not Found'));
-        $this->tpl->assign('error_message', $message);
-        $this->renderPage('404');
-    }
 }
diff --git a/application/security/SessionManager.php b/application/security/SessionManager.php
index 46219a3d..76b0afe8 100644
--- a/application/security/SessionManager.php
+++ b/application/security/SessionManager.php
@@ -49,6 +49,20 @@ class SessionManager
     }
 
     /**
+     * Initialize XSRF token and links per page session variables.
+     */
+    public function initialize(): void
+    {
+        if (!isset($this->session['tokens'])) {
+            $this->session['tokens'] = [];
+        }
+
+        if (!isset($this->session['LINKS_PER_PAGE'])) {
+            $this->session['LINKS_PER_PAGE'] = $this->conf->get('general.links_per_page', 20);
+        }
+    }
+
+    /**
      * Define whether the user should stay signed in across browser sessions
      *
      * @param bool $staySignedIn Keep the user signed in