From a4a870e1ec3ee075b8c1020f9030859beb1f23da Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Apr 2014 19:11:26 +0300 Subject: default config is included after user config to prevent undefined constant warning --- inc/poche/global.inc.php | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 inc/poche/global.inc.php (limited to 'inc/poche/global.inc.php') 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) { -- cgit v1.2.3 From 43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Apr 2014 20:58:40 +0300 Subject: config.inc.php.new renamed in config.inc.default.php --- inc/poche/global.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/global.inc.php') diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php index a77081a2..14e9dd93 100755 --- a/inc/poche/global.inc.php +++ b/inc/poche/global.inc.php @@ -43,7 +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'; + require_once INCLUDES . '/poche/config.inc.default.php'; } if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { -- cgit v1.2.3