Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index e312d8721dc7f077c9da839d7110d8ebfd2f1a03..6ec61db724c4b136b1f85ed109f1f4884d17af5b 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -50,11 +50,8 @@ class App
        public $argv;
        public $argc;
        public $module;
-       public $hooks = [];
        public $timezone;
        public $interactive = true;
-       public $addons;
-       public $addons_admin = [];
        public $identities;
        public $is_mobile = false;
        public $is_tablet = false;
@@ -360,7 +357,7 @@ class App
                Core\Config::load();
 
                if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
-                       Core\Addon::loadHooks();
+                       Core\Hook::loadHooks();
 
                        $this->loadAddonConfig();
                }
@@ -576,7 +573,11 @@ class App
 
                $stamp1 = microtime(true);
 
-               DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset);
+               if (DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset)) {
+                       // Loads DB_UPDATE_VERSION constant
+                       Database\DBStructure::definition();
+               }
+
                unset($db_host, $db_user, $db_pass, $db_data, $charset);
 
                $this->saveTimestamp($stamp1, 'network');