Merge pull request #4852 from tobiasd/20180417-fi

[friendica.git] / index.php

diff --git a/index.php b/index.php
index ca7b4217a7fec420e92e56b030257ba2bac55845..e3ab16469b17f75d07a6e522b7206a18efec9229 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,9 +24,7 @@ use Friendica\Module\Login;
 
 require_once 'boot.php';
 
-if (empty($a)) {
-       $a = new App(__DIR__);
-}
+$a = new App(__DIR__);
 BaseObject::setApp($a);
 
 // We assume that the index.php is called by a frontend process
@@ -53,9 +51,13 @@ if (!$install) {
 require_once "include/dba.php";
 
 if (!$install) {
-       dba::connect($db_host, $db_user, $db_pass, $db_data, $install);
+       $result = dba::connect($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
 
+       if (!$result) {
+               System::unavailable();
+       }
+
        /**
         * Load configs from db. Overwrite configs from .htconfig.php
         */
@@ -78,6 +80,7 @@ if (!$install) {
                exit();
        }
 
+       Config::init();
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');