diff options
| author | tcit <tcit@tcit.fr> | 2014-04-23 10:34:22 +0200 |
|---|---|---|
| committer | tcit <tcit@tcit.fr> | 2014-04-23 10:34:22 +0200 |
| commit | c97d23c5334b363250a1d7cfc5cffd0087f35c21 (patch) | |
| tree | 455a4cd0886c0beb51f036482811fb94cbc5fa5e /inc/poche/global.inc.php | |
| parent | 4d99bae893eb47505f8ff6976917ef3af363ff5b (diff) | |
| parent | 2a6440c134ee2d90a84b3e3a2e039d8fb4d83d04 (diff) | |
| download | wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.tar.gz wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.tar.zst wallabag-c97d23c5334b363250a1d7cfc5cffd0087f35c21.zip | |
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
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) { |