X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=40cadf885ae03459f4af2d95c397e701a5c9bd95;hb=339d510fda0a43b08981309f7540acedf3a4976c;hp=19774bb67912714c9bda873141985b0e3ce5cf62;hpb=b161295d0b53a5ae194e236b0a7c662e9ac2ff9a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 19774bb6..40cadf88 100644
--- a/index.php
+++ b/index.php
@@ -10,19 +10,11 @@
 
 include dirname(__FILE__).'/inc/poche/config.inc.php';
 
-#XSRF protection with token
-// if (!empty($_POST)) {
-//     if (!Session::isToken($_POST['token'])) {
-//         die(_('Wrong token'));
-//     }
-//     unset($_SESSION['tokens']);
-// }
-
 $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 $view = Tools::checkVar('view', 'home');
 $action = Tools::checkVar('action');
 $id = Tools::checkVar('id');
-$_SESSION['sort'] = Tools::checkVar('sort');
+$_SESSION['sort'] = Tools::checkVar('sort', 'id');
 $url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
 
 if (isset($_GET['login'])) {
@@ -61,5 +53,9 @@ else {
     $tpl_file = 'login.twig';
 }
 
+# because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
+$messages = $poche->messages->display('all', FALSE);
+$tpl_vars = array_merge($tpl_vars, array('messages' => $messages));
+
 # Aaaaaaand action !
 echo $poche->tpl->render($tpl_file, $tpl_vars);
\ No newline at end of file