diff options
| author | Vincent Malley <vincent.malley@insalien.org> | 2015-06-02 11:09:37 -0400 |
|---|---|---|
| committer | Vincent Malley <vincent.malley@insalien.org> | 2015-06-02 11:09:37 -0400 |
| commit | 900f2a91604bf04e86ac7ff4a22f2b19439c6652 (patch) | |
| tree | 0185d8b6fbd1ea5a48ad1ed2e79394cb3596f95e /inc/poche/Routing.class.php | |
| parent | f9c8087f787b6ac38ca2c3b6a876a803860b8991 (diff) | |
| parent | ddbb2308a3302e2d2d6ff89f4dd3235f85d335e1 (diff) | |
| download | wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.gz wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.tar.zst wallabag-900f2a91604bf04e86ac7ff4a22f2b19439c6652.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'inc/poche/Routing.class.php')
| -rwxr-xr-x | inc/poche/Routing.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 138da48d..33a81435 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php | |||
| @@ -141,7 +141,7 @@ class Routing | |||
| 141 | $pdf->producePDF(); | 141 | $pdf->producePDF(); |
| 142 | } elseif (isset($_GET['import'])) { | 142 | } elseif (isset($_GET['import'])) { |
| 143 | $import = $this->wallabag->import(); | 143 | $import = $this->wallabag->import(); |
| 144 | $tplVars = array_merge($this->vars, $import); | 144 | $this->vars = array_merge($this->vars, $import); |
| 145 | } elseif (isset($_GET['empty-cache'])) { | 145 | } elseif (isset($_GET['empty-cache'])) { |
| 146 | Tools::emptyCache(); | 146 | Tools::emptyCache(); |
| 147 | } elseif (isset($_GET['export'])) { | 147 | } elseif (isset($_GET['export'])) { |