Merge remote-tracking branch 'upstream/develop' into fetchprofile

This commit is contained in:
Michael 2019-04-09 10:29:53 +00:00
commit 00071abf51
2 changed files with 3 additions and 1 deletions

View file

@ -1270,7 +1270,8 @@ class App
// First we try explicit routes defined in App\Router
$this->router->collectRoutes();
Hook::callAll('route_collection', $this->router->getRouteCollector());
$data = $this->router->getRouteCollector();
Hook::callAll('route_collection', $data);
$this->module_class = $this->router->getModuleClass($this->cmd);

View file

@ -411,6 +411,7 @@ class Update
'uid' => $admin['uid'],
'type' => SYSTEM_EMAIL,
'to_email' => $admin['email'],
'subject' => l10n::t('[Friendica Notify] Database update'),
'preamble' => $preamble,
'body' => $body,
'language' => $lang]