Merge branch 'develop' of https://github.com/friendica/friendica into develop

2018-10-23 00:05:03 +02:00 · 2018-10-23 00:05:03 +02:00 · fff0dafbdd
commit fff0dafbdd
parent ff203c277d f6e064195a
1 changed files with 2 additions and 1 deletions
--- a/src/App.php
+++ b/src/App.php
@ -1715,7 +1715,8 @@ class App
 		} else {
 			$this->checkURL();
 			check_db(false);
-			Core\Addon::check();
+			Core\Addon::loadAddons();
+			Core\Hook::loadHooks();
 		}

 		$this->page = [