X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=7f72b14699e8e334c4101e7680dd63d4c4cd70a9;hb=refs%2Fpull%2F609%2Fhead;hp=fb13f38d499f3a271083a93e2aff26994991c232;hpb=028e34b6c40c3571d35c49d5a27b7eac19ceb4ef;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index fb13f38d..7f72b146
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.3');
+define ('POCHE', '1.6.0');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
 
@@ -40,7 +40,7 @@ $tpl_vars = array(
 
 if (! empty($notInstalledMessage)) {
     if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
-        # We cannot use Twig to display the error message 
+        # We cannot use Twig to display the error message
         echo '<h1>Errors</h1><ol>';
         foreach ($notInstalledMessage as $message) {
             echo '<li>' . $message . '</li>';
@@ -67,7 +67,8 @@ if (isset($_GET['login'])) {
     # Update password
     $poche->updatePassword();
 } elseif (isset($_GET['import'])) {
-    $import = $poche->import($_GET['from']);
+    $import = $poche->import();
+    $tpl_vars = array_merge($tpl_vars, $import);
 } elseif (isset($_GET['download'])) {
     Tools::download_db();
 } elseif (isset($_GET['empty-cache'])) {