diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-05-22 18:51:27 +0200 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-05-22 18:51:27 +0200 |
| commit | 710698346475b4859651fbc189b910c7e462f1ff (patch) | |
| tree | b80176cee6a8586fca9ff26b5361ced53ffa4e91 /inc/poche/Routing.class.php | |
| parent | 251fa4af943989285f853cdb1ff6d5c1be58a13f (diff) | |
| parent | 2c8394027020a297ea435d36c30b4c63981cf473 (diff) | |
| download | wallabag-710698346475b4859651fbc189b910c7e462f1ff.tar.gz wallabag-710698346475b4859651fbc189b910c7e462f1ff.tar.zst wallabag-710698346475b4859651fbc189b910c7e462f1ff.zip | |
Merge pull request #1200 from wallabag/fix-relaunch-import
fix restart of import
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'])) { |