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

diff --git a/src/App.php b/src/App.php
index 1649a8745479f55fd74a1123b2be4e3af9bd370a..2576cc5d8ea7447d49d2ab7101028b4bd1f704e1 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -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);
 

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 8c15002a606ea66ccf3e645deec0ca617de9abc0..d2bbc237c7b656a078a539fbd15c759c3b2cedda 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -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]