aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/global.inc.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-12-14 00:16:39 +0100
committerThomas Citharel <tcit@tcit.fr>2014-12-14 00:16:39 +0100
commit1256e4c645c86f4165d052bf8116b957b373b837 (patch)
tree3cc3bd960df403a6e0645afcd9e4f5bbb68bfc0e /inc/poche/global.inc.php
parent9c55ed0923273da886497cb62302a79622e34a74 (diff)
parentdc69d3e8d895c87f9d26c2d1309e40d6090d4c8d (diff)
downloadwallabag-1256e4c645c86f4165d052bf8116b957b373b837.tar.gz
wallabag-1256e4c645c86f4165d052bf8116b957b373b837.tar.zst
wallabag-1256e4c645c86f4165d052bf8116b957b373b837.zip
Merge branch 'tcitworld-ebook' into dev
Diffstat (limited to 'inc/poche/global.inc.php')
-rwxr-xr-xinc/poche/global.inc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index b8c487e3..728528f8 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -22,7 +22,7 @@ require_once ROOT . '/vendor/autoload.php';
22require_once INCLUDES . '/poche/Template.class.php'; 22require_once INCLUDES . '/poche/Template.class.php';
23require_once INCLUDES . '/poche/Language.class.php'; 23require_once INCLUDES . '/poche/Language.class.php';
24require_once INCLUDES . '/poche/Routing.class.php'; 24require_once INCLUDES . '/poche/Routing.class.php';
25require_once INCLUDES . '/poche/WallabagEpub.class.php'; 25require_once INCLUDES . '/poche/WallabagEBooks.class.php';
26require_once INCLUDES . '/poche/Poche.class.php'; 26require_once INCLUDES . '/poche/Poche.class.php';
27 27
28require_once INCLUDES . '/poche/Database.class.php'; 28require_once INCLUDES . '/poche/Database.class.php';
@@ -41,6 +41,13 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
41require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; 41require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
42require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; 42require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
43 43
44# mobi library
45require_once INCLUDES . '/3rdparty/libraries/MOBIClass/MOBI.php';
46
47# pdf library
48#require_once INCLUDES . '/3rdparty/libraries/mpdf/mpdf.php';
49require_once INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php';
50
44# system configuration; database credentials et caetera 51# system configuration; database credentials et caetera
45require_once INCLUDES . '/poche/config.inc.php'; 52require_once INCLUDES . '/poche/config.inc.php';
46require_once INCLUDES . '/poche/config.inc.default.php'; 53require_once INCLUDES . '/poche/config.inc.default.php';