aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php31
1 files changed, 12 insertions, 19 deletions
diff --git a/index.php b/index.php
index 9bca1527b..2e24c5b01 100644
--- a/index.php
+++ b/index.php
@@ -44,18 +44,19 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
unset($db_host, $db_user, $db_pass, $db_data);
-/**
- * Load configs from db. Overwrite configs from .htconfig.php
- */
-$r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')");
-foreach ($r as $c) {
- if ($c['cat']=='config') {
- $a->config[$c['k']] = $c['v'];
- } else {
- $a->config[$c['cat']][$c['k']] = $c['v'];
- }
+if(! $install) {
+
+ /**
+ * Load configs from db. Overwrite configs from .htconfig.php
+ */
+
+ load_config('config');
+ load_config('system');
+
+ require_once("session.php");
+ load_hooks();
+ call_hooks('init_1');
}
-unset($r);
/**
@@ -70,14 +71,6 @@ unset($r);
*
*/
-if(! $install) {
- require_once("session.php");
- load_hooks();
- call_hooks('init_1');
-}
-
-
-
require_once("datetime.php");
$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');