clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Michael 2019-04-09 10:29:53 +00:00
parent 84a6e390ab 6ea531d2f8
commit 00071abf51
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/App.php
View File

@ -1270,7 +1270,8 @@ class App
// First we try explicit routes defined in App\Router // First we try explicit routes defined in App\Router
$this->router->collectRoutes(); $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); $this->module_class = $this->router->getModuleClass($this->cmd);

1
src/Core/Update.php
View File

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