diff options
| author | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-04-22 19:11:26 +0300 |
|---|---|---|
| committer | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-04-22 19:11:26 +0300 |
| commit | a4a870e1ec3ee075b8c1020f9030859beb1f23da (patch) | |
| tree | 45be1d7181f024276b39389c522990f6459e81f3 /inc | |
| parent | c2cf7075c24c1539befd4ba09881eed761c9d769 (diff) | |
| download | wallabag-a4a870e1ec3ee075b8c1020f9030859beb1f23da.tar.gz wallabag-a4a870e1ec3ee075b8c1020f9030859beb1f23da.tar.zst wallabag-a4a870e1ec3ee075b8c1020f9030859beb1f23da.zip | |
default config is included after user config to prevent undefined constant warning
Diffstat (limited to 'inc')
| -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..a77081a2 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.php.new'; | ||
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { | 49 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { |