From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Tue, 22 Apr 2014 16:11:26 +0000 (+0300)
Subject: default config is included after user config to prevent undefined constant warning
X-Git-Tag: 1.7.0^2~19^2~2^2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a4a870e1ec3ee075b8c1020f9030859beb1f23da;p=github%2Fwallabag%2Fwallabag.git

default config is included after user config to prevent undefined constant warning
---

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
old mode 100644
new mode 100755
index 15091387..a77081a2
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -43,6 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
     Poche::$configFileAvailable = false;
 } else {
     require_once INCLUDES . '/poche/config.inc.php';
+    require_once INCLUDES . '/poche/config.inc.php.new';
 }
 
 if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {