Identify the login page explicitly by the page title

Signed-off-by: Christopher Ng <chrng8@gmail.com>

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index ff2cb641f88207501221e1681a5d03690f799ed1..3694e672977c0a855237b837197fd2c9c9ca41e0 100644 (file)
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -201,12 +201,16 @@ class LoginController extends Controller {
 
                $parameters = [
                        'alt_login' => OC_App::getAlternativeLogIns(),
+                       'pageTitle' => $this->l10n->t('Login'),
                ];
 
                $this->initialStateService->provideInitialState('core', 'countAlternativeLogins', count($parameters['alt_login']));
 
                return new TemplateResponse(
-                       $this->appName, 'login', $parameters, 'guest'
+                       $this->appName,
+                       'login',
+                       $parameters,
+                       TemplateResponse::RENDER_AS_GUEST,
                );
        }
 

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 980d9abb7c4268b2dcc30d662cd4cc3e91591384..432bc4e860188bdfda384fb7e0c23320a3bbadc8 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -7,7 +7,10 @@
  data-requesttoken="<?php p($_['requesttoken']); ?>">
                <meta charset="utf-8">
                <title>
-               <?php p($theme->getTitle()); ?>
+                       <?php
+                               p(!empty($_['pageTitle']) ? $_['pageTitle'] . ' – ' : '');
+                               p($theme->getTitle());
+                       ?>
                </title>
                <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
                <?php if ($theme->getiTunesAppId() !== '') { ?>