summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2013-12-03 16:18:22 +0100
committerPhilip Häusler <msquare@notrademark.de>2013-12-03 16:18:22 +0100
commite9565a79eaa6b23bbf530dd8611feb1f170be781 (patch)
treedf5a5d6934107d1c175c6b4f4079cfe69a48a197 /public
parentd5b03110613df849222fa3efec348f92a84e5896 (diff)
simplified config
Diffstat (limited to 'public')
-rw-r--r--public/index.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/public/index.php b/public/index.php
index 82ece193..08eb433e 100644
--- a/public/index.php
+++ b/public/index.php
@@ -22,8 +22,9 @@ require_once ('includes/helper/internationalization_helper.php');
require_once ('includes/helper/message_helper.php');
require_once ('includes/helper/error_helper.php');
-require_once ('config/config.php');
-require_once ('config/config_db.php');
+require_once ('config/config.default.php');
+if(file_exists('config/config.php'))
+ require_once ('config/config.php');
require_once ('includes/pages/admin_active.php');
require_once ('includes/pages/admin_angel_types.php');