load $a->config from db

1 files changed, 14 insertions, 1 deletions

diff --git a/index.php b/index.php
index 534cb93f7..9bca1527b 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-
 $lang = get_language();
 	
 load_translation_table($lang);
@@ -46,6 +45,20 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
 
 
 /**
+ * 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'];
+	}
+}
+unset($r);
+
+
+/**
  *
  * Important stuff we always need to do.
  * Initialise authentication and  date and time.