diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-11 16:03:59 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-11 16:03:59 +0200 |
commit | 3602405ec0dbc576fce09ff9e865ba2404622080 (patch) | |
tree | 45f9de611f4936091b0ed29a6a21fa4fef9b330b /inc/poche/global.inc.php | |
parent | 6400371ff93782d25cdbd50aa224c70145b3890a (diff) | |
download | wallabag-3602405ec0dbc576fce09ff9e865ba2404622080.tar.gz wallabag-3602405ec0dbc576fce09ff9e865ba2404622080.tar.zst wallabag-3602405ec0dbc576fce09ff9e865ba2404622080.zip |
WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)
Diffstat (limited to 'inc/poche/global.inc.php')
-rwxr-xr-x | inc/poche/global.inc.php | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php index 8cf86d03..2c22c014 100755 --- a/inc/poche/global.inc.php +++ b/inc/poche/global.inc.php | |||
@@ -5,7 +5,7 @@ | |||
5 | * @category wallabag | 5 | * @category wallabag |
6 | * @author Nicolas Lœuillet <nicolas@loeuillet.org> | 6 | * @author Nicolas Lœuillet <nicolas@loeuillet.org> |
7 | * @copyright 2013 | 7 | * @copyright 2013 |
8 | * @license http://www.wtfpl.net/ see COPYING file | 8 | * @license http://opensource.org/licenses/MIT see COPYING file |
9 | */ | 9 | */ |
10 | 10 | ||
11 | # the poche system root directory (/inc) | 11 | # the poche system root directory (/inc) |
@@ -18,6 +18,10 @@ require_once INCLUDES . '/poche/Tools.class.php'; | |||
18 | require_once INCLUDES . '/poche/User.class.php'; | 18 | require_once INCLUDES . '/poche/User.class.php'; |
19 | require_once INCLUDES . '/poche/Url.class.php'; | 19 | require_once INCLUDES . '/poche/Url.class.php'; |
20 | require_once INCLUDES . '/3rdparty/class.messages.php'; | 20 | require_once INCLUDES . '/3rdparty/class.messages.php'; |
21 | require_once ROOT . '/vendor/autoload.php'; | ||
22 | require_once INCLUDES . '/poche/Template.class.php'; | ||
23 | require_once INCLUDES . '/poche/Language.class.php'; | ||
24 | require_once INCLUDES . '/poche/Routing.class.php'; | ||
21 | require_once INCLUDES . '/poche/Poche.class.php'; | 25 | require_once INCLUDES . '/poche/Poche.class.php'; |
22 | 26 | ||
23 | require_once INCLUDES . '/poche/Database.class.php'; | 27 | require_once INCLUDES . '/poche/Database.class.php'; |
@@ -36,22 +40,11 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php'; | |||
36 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; | 40 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; |
37 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; | 41 | require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; |
38 | 42 | ||
39 | # Composer its autoloader for automatically loading Twig | ||
40 | if (! file_exists(ROOT . '/vendor/autoload.php')) { | ||
41 | Poche::$canRenderTemplates = false; | ||
42 | } else { | ||
43 | require_once ROOT . '/vendor/autoload.php'; | ||
44 | } | ||
45 | |||
46 | # system configuration; database credentials et caetera | 43 | # system configuration; database credentials et caetera |
47 | if (! file_exists(INCLUDES . '/poche/config.inc.php')) { | 44 | require_once INCLUDES . '/poche/config.inc.php'; |
48 | Poche::$configFileAvailable = false; | 45 | require_once INCLUDES . '/poche/config.inc.default.php'; |
49 | } else { | ||
50 | require_once INCLUDES . '/poche/config.inc.php'; | ||
51 | require_once INCLUDES . '/poche/config.inc.default.php'; | ||
52 | } | ||
53 | 46 | ||
54 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { | 47 | if (DOWNLOAD_PICTURES) { |
55 | require_once INCLUDES . '/poche/pochePictures.php'; | 48 | require_once INCLUDES . '/poche/pochePictures.php'; |
56 | } | 49 | } |
57 | 50 | ||