Merge commit 'upstream/master'

[friendica.git] / include / directory.php

diff --git a/include/directory.php b/include/directory.php
index 2c9daa5ea6f3b025241a0a2d65f79bc734c417c1..cae78adb4e61564c161f390ed5959fe04c6f112c 100644 (file)
--- a/include/directory.php
+++ b/include/directory.php
@@ -2,18 +2,22 @@
 require_once("boot.php");
 
 function directory_run($argv, $argc){
-  global $a, $db;
+       global $a, $db;
 
-  if(is_null($a)){
-    $a = new App;
-  }
+       if(is_null($a)) {
+               $a = new App;
+       }
   
-  if(is_null($db)){
-    @include(".htconfig.php");
-    require_once("dba.php");
-    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    unset($db_host, $db_user, $db_pass, $db_data);
-  };
+       if(is_null($db)) {
+               @include(".htconfig.php");
+               require_once("dba.php");
+               $db = new dba($db_host, $db_user, $db_pass, $db_data);
+                               unset($db_host, $db_user, $db_pass, $db_data);
+       };
+
+       load_config('config');
+       load_config('system');
+
 
        if($argc != 2)
                return;