aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/templates/loginflow/authpicker.php4
-rw-r--r--core/templates/loginflowv2/authpicker.php4
-rw-r--r--lib/public/AppFramework/App.php1
3 files changed, 9 insertions, 0 deletions
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php
index 3b12fbe2f07..edcc5565d16 100644
--- a/core/templates/loginflow/authpicker.php
+++ b/core/templates/loginflow/authpicker.php
@@ -36,6 +36,10 @@ $urlGenerator = $_['urlGenerator'];
])) ?>
</p>
+ <p class="info">
+ <?php print_unescaped($l->t('If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator.')) ?>
+ </p>
+
<br/>
<p id="redirect-link">
diff --git a/core/templates/loginflowv2/authpicker.php b/core/templates/loginflowv2/authpicker.php
index ccc9162bbc3..a32787f22b8 100644
--- a/core/templates/loginflowv2/authpicker.php
+++ b/core/templates/loginflowv2/authpicker.php
@@ -35,6 +35,10 @@ $urlGenerator = $_['urlGenerator'];
])) ?>
</p>
+ <p class="info">
+ <?php print_unescaped($l->t('If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator.')) ?>
+ </p>
+
<br/>
<p id="redirect-link">
diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php
index 016ef5a0318..2f55fd45140 100644
--- a/lib/public/AppFramework/App.php
+++ b/lib/public/AppFramework/App.php
@@ -143,6 +143,7 @@ class App {
* @param array $routes
* @since 6.0.0
* @suppress PhanAccessMethodInternal
+ * @deprecated 20.0.0 Just return an array from your routes.php
*/
public function registerRoutes(IRouter $router, array $routes) {
$routeConfig = new RouteConfig($this->container, $router, $routes);