diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-04-22 20:18:46 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-04-22 20:18:46 +0200 |
| commit | d70dd7ac698a1f9e90c97fa7eb7b113bf84304fc (patch) | |
| tree | 69c330e97e3de60dd6884ded76766426a598f30e /inc/poche/global.inc.php | |
| parent | dfff18f81b04e4f66890c37dc2a7bc0537fd0b1b (diff) | |
| parent | 43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa (diff) | |
| download | wallabag-d70dd7ac698a1f9e90c97fa7eb7b113bf84304fc.tar.gz wallabag-d70dd7ac698a1f9e90c97fa7eb7b113bf84304fc.tar.zst wallabag-d70dd7ac698a1f9e90c97fa7eb7b113bf84304fc.zip | |
Merge pull request #653 from mariroz/dev
print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
Diffstat (limited to 'inc/poche/global.inc.php')
| -rwxr-xr-x[-rw-r--r--] | inc/poche/global.inc.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php index 15091387..14e9dd93 100644..100755 --- a/inc/poche/global.inc.php +++ b/inc/poche/global.inc.php | |||
| @@ -43,6 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) { | |||
| 43 | Poche::$configFileAvailable = false; | 43 | Poche::$configFileAvailable = false; |
| 44 | } else { | 44 | } else { |
| 45 | require_once INCLUDES . '/poche/config.inc.php'; | 45 | require_once INCLUDES . '/poche/config.inc.php'; |
| 46 | require_once INCLUDES . '/poche/config.inc.default.php'; | ||
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { | 49 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { |