diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-12-14 00:16:39 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-12-14 00:16:39 +0100 |
commit | 1256e4c645c86f4165d052bf8116b957b373b837 (patch) | |
tree | 3cc3bd960df403a6e0645afcd9e4f5bbb68bfc0e /inc/poche/global.inc.php | |
parent | 9c55ed0923273da886497cb62302a79622e34a74 (diff) | |
parent | dc69d3e8d895c87f9d26c2d1309e40d6090d4c8d (diff) | |
download | wallabag-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-x | inc/poche/global.inc.php | 9 |
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'; | |||
22 | require_once INCLUDES . '/poche/Template.class.php'; | 22 | require_once INCLUDES . '/poche/Template.class.php'; |
23 | require_once INCLUDES . '/poche/Language.class.php'; | 23 | require_once INCLUDES . '/poche/Language.class.php'; |
24 | require_once INCLUDES . '/poche/Routing.class.php'; | 24 | require_once INCLUDES . '/poche/Routing.class.php'; |
25 | require_once INCLUDES . '/poche/WallabagEpub.class.php'; | 25 | require_once INCLUDES . '/poche/WallabagEBooks.class.php'; |
26 | require_once INCLUDES . '/poche/Poche.class.php'; | 26 | require_once INCLUDES . '/poche/Poche.class.php'; |
27 | 27 | ||
28 | require_once INCLUDES . '/poche/Database.class.php'; | 28 | require_once INCLUDES . '/poche/Database.class.php'; |
@@ -41,6 +41,13 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php'; | |||
41 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; | 41 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; |
42 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; | 42 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; |
43 | 43 | ||
44 | # mobi library | ||
45 | require_once INCLUDES . '/3rdparty/libraries/MOBIClass/MOBI.php'; | ||
46 | |||
47 | # pdf library | ||
48 | #require_once INCLUDES . '/3rdparty/libraries/mpdf/mpdf.php'; | ||
49 | require_once INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php'; | ||
50 | |||
44 | # system configuration; database credentials et caetera | 51 | # system configuration; database credentials et caetera |
45 | require_once INCLUDES . '/poche/config.inc.php'; | 52 | require_once INCLUDES . '/poche/config.inc.php'; |
46 | require_once INCLUDES . '/poche/config.inc.default.php'; | 53 | require_once INCLUDES . '/poche/config.inc.default.php'; |