merge fix 776

[github/wallabag/wallabag.git] / inc / poche / global.inc.php

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 9d710b6cee702cdc89cfa87b8b86a5a38352dda2..b8c487e39277e604c684c880e4b03d55d358829e 100755 (executable)
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -22,6 +22,7 @@ require_once ROOT . '/vendor/autoload.php';
 require_once INCLUDES . '/poche/Template.class.php';
 require_once INCLUDES . '/poche/Language.class.php';
 require_once INCLUDES . '/poche/Routing.class.php';
+require_once INCLUDES . '/poche/WallabagEpub.class.php';
 require_once INCLUDES . '/poche/Poche.class.php';
 
 require_once INCLUDES . '/poche/Database.class.php';
@@ -40,12 +41,6 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
 
-require_once INCLUDES . '/3rdparty/PicoFarad/Request.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Response.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Router.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Session.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Template.php';
-
 # system configuration; database credentials et caetera
 require_once INCLUDES . '/poche/config.inc.php';
 require_once INCLUDES . '/poche/config.inc.default.php';
@@ -61,10 +56,3 @@ if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timez
 if (defined('ERROR_REPORTING')) {
     error_reporting(ERROR_REPORTING);
 }
-
-// Start session
-Session::$sessionName = 'wallabag';
-Session::init();
-
-// Let's rock !
-$wallabag = new Poche();