aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Routing.class.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-13 17:14:08 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-13 17:14:08 +0100
commit57068585c0a1164f1ae7ae399f3d5a68a4e9d46d (patch)
tree479969a1a9888c34285e0f84a8186561ebe980e7 /inc/poche/Routing.class.php
parent1be071f9f0fba7c93f114a886ff19199955a3f02 (diff)
parentaf13787e74ea45d7edc1005810f15a8baa428a77 (diff)
downloadwallabag-57068585c0a1164f1ae7ae399f3d5a68a4e9d46d.tar.gz
wallabag-57068585c0a1164f1ae7ae399f3d5a68a4e9d46d.tar.zst
wallabag-57068585c0a1164f1ae7ae399f3d5a68a4e9d46d.zip
Merge branch 'dev' into sendmailatregistration
Diffstat (limited to 'inc/poche/Routing.class.php')
-rwxr-xr-xinc/poche/Routing.class.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index b8cab0ec..82ff20d6 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -33,6 +33,7 @@ class Routing
33 $this->view = Tools::checkVar('view', 'home'); 33 $this->view = Tools::checkVar('view', 'home');
34 $this->action = Tools::checkVar('action'); 34 $this->action = Tools::checkVar('action');
35 $this->id = Tools::checkVar('id'); 35 $this->id = Tools::checkVar('id');
36 $this->autoclose = Tools::checkVar('autoclose',FALSE);
36 $_SESSION['sort'] = Tools::checkVar('sort', 'id'); 37 $_SESSION['sort'] = Tools::checkVar('sort', 'id');
37 $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : ''); 38 $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
38 } 39 }
@@ -64,7 +65,7 @@ class Routing
64 $tplVars = array(); 65 $tplVars = array();
65 66
66 if (\Session::isLogged()) { 67 if (\Session::isLogged()) {
67 $this->wallabag->action($this->action, $this->url, $this->id); 68 $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
68 $tplFile = Tools::getTplFile($this->view); 69 $tplFile = Tools::getTplFile($this->view);
69 $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id)); 70 $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
70 } elseif(isset($_SERVER['PHP_AUTH_USER'])) { 71 } elseif(isset($_SERVER['PHP_AUTH_USER'])) {