Revert "Add SHAARLI support to view template"

[github/wallabag/wallabag.git] / index.php

diff --git a/index.php b/index.php
index 353df873fb14c7f8ce1b53e8d2f64ee9a0b8cb00..5f43b7400c007887e94fe364bb66aabb78635499 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,6 +8,12 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) {
+    require_once __DIR__ . '/inc/poche/myconfig.inc.php';
+}
+require_once './inc/poche/Tools.class.php';
+Tools::createMyConfig();
+
 include dirname(__FILE__).'/inc/poche/config.inc.php';
 
 # Parse GET & REFERER vars
@@ -32,7 +38,7 @@ elseif (isset($_GET['config'])) {
     $poche->updatePassword();
 }
 elseif (isset($_GET['import'])) {
-    $poche->import($_GET['from']);
+    $import = $poche->import($_GET['from']);
 }
 elseif (isset($_GET['export'])) {
     $poche->export();
@@ -53,7 +59,6 @@ if (Session::isLogged()) {
     $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id));
 }
 else {
-    # login
     $tpl_file = 'login.twig';
 }