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

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index f66cf4bc0fe39e98f98af7a251fa2506d1c93bb8..ff036c3dfa603bc79a390bd94a06c51580ca5c61 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -498,9 +498,6 @@ function install_plugin($plugin){
 if(! function_exists('check_config')) {
 function check_config(&$a) {
 
-
-       load_config('system');
-
        $build = get_config('system','build');
        if(! x($build))
                $build = set_config('system','build',DB_UPDATE_VERSION);
@@ -1218,7 +1215,11 @@ function load_config($family) {
        if(count($r)) {
                foreach($r as $rr) {
                        $k = $rr['k'];
-                       $a->config[$family][$k] = $rr['v'];
+                       if ($rr['cat'] === 'config') {
+                               $a->config[$k] = $rr['v'];
+                       } else {
+                               $a->config[$family][$k] = $rr['v'];
+                       }
                }
        }
 }}