The config class now makes less database reads.

[friendica.git] / include / directory.php

diff --git a/include/directory.php b/include/directory.php
index 29a793a2a01ecba93efe2a11ac7b6adea3d1d7ff..2ca367d369442dc1a31bed67ad81cc1f64659a7e 100644 (file)
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,39 +1,39 @@
 <?php
 require_once("boot.php");
 
+use \Friendica\Core\Config;
+
 function directory_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
                @include(".htconfig.php");
-               require_once("dba.php");
+               require_once("include/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');
-
+       Config::load();
 
        if($argc != 2)
                return;
 
-       load_config('system');
-
        load_hooks();
 
 
        $a->set_baseurl(get_config('system','url'));
 
-       $dir = get_config('system','directory_submit_url');
+       $dir = get_config('system','directory');
 
        if(! strlen($dir))
                return;
 
+       $dir .= "/submit";
+
        $arr = array('url' => $argv[1]);
 
        call_hooks('globaldir_update', $arr);
@@ -46,6 +46,6 @@ function directory_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  directory_run($argv,$argc);
+  directory_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }