summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-02-06 12:42:13 -0500
committerFrederic Guillot <fred@kanboard.net>2016-02-06 12:42:13 -0500
commitfc785bbbf6cc7db01964ae1d99cd02e85afeedc2 (patch)
tree854d478499cdd5d5a3212bde1d567d19c41b2c84
parent7df68511a5f4445b149f0f1cdea3bafb638bf2b2 (diff)
Search for config file in both locations
-rw-r--r--app/common.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/common.php b/app/common.php
index 399fcb86..e2fe6aff 100644
--- a/app/common.php
+++ b/app/common.php
@@ -16,7 +16,9 @@ if (getenv('DATABASE_URL')) {
if (file_exists('config.php')) {
require 'config.php';
-} elseif (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) {
+}
+
+if (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) {
require 'data'.DIRECTORY_SEPARATOR.'config.php';
}