load db configs (config,system) for all "executables"

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a58e4730fa42fe77744b18c548af26f7b5f141a3..2e24c5b015c3130fafba4d9df2ea5a51e449bc13 100644 (file)
--- a/index.php
+++ b/index.php
@@ -50,15 +50,8 @@ if(! $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);
+       load_config('config');
+       load_config('system');
 
        require_once("session.php");
        load_hooks();