Use the exclamation mark to address forums as well

[friendica.git] / include / cli_startup.php

diff --git a/include/cli_startup.php b/include/cli_startup.php
index e8cc9483dbc35311f2dddb12ed6e4f1f2c414881..645e5eddd8544e8c29b50478834ec1de34dee874 100644 (file)
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -8,19 +8,16 @@ require_once('boot.php');
 // Everything we need to boot standalone 'background' processes
 
 function cli_startup() {
+       global $a;
 
-       global $a, $db;
-
-       if (is_null($a)) {
-               $a = new App;
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
        }
 
-       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);
-       };
+       @include(".htconfig.php");
+       require_once("dba.php");
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        require_once('include/session.php');
 
@@ -29,5 +26,4 @@ function cli_startup() {
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();
-
 }