From 36d7b587cbe6c6697d140b2fb628c0485cbe03d2 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 4 Oct 2018 11:38:42 +0800
Subject: [PATCH] MDL-63528 auth: Show "Remember username" on login form only
 when needed

---
 auth/classes/output/login.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/auth/classes/output/login.php b/auth/classes/output/login.php
index 973c7d7f94b..584abb82d6a 100644
--- a/auth/classes/output/login.php
+++ b/auth/classes/output/login.php
@@ -78,7 +78,7 @@ class login implements renderable, templatable {
      * @param string $username The username to display.
      */
     public function __construct(array $authsequence, $username = '') {
-        global $CFG, $SESSION;
+        global $CFG;
 
         $this->username = $username;
 
@@ -87,12 +87,13 @@ class login implements renderable, templatable {
         $this->cansignup = $CFG->registerauth == 'email' || !empty($CFG->registerauth);
         if ($CFG->rememberusername == 0) {
             $this->cookieshelpicon = new help_icon('cookiesenabledonlysession', 'core');
+            $this->rememberusername = false;
         } else {
             $this->cookieshelpicon = new help_icon('cookiesenabled', 'core');
+            $this->rememberusername = true;
         }
 
         $this->autofocusform = !empty($CFG->loginpageautofocus);
-        $this->rememberusername = isset($CFG->rememberusername) and $CFG->rememberusername == 2;
 
         $this->forgotpasswordurl = new moodle_url('/login/forgot_password.php');
         $this->loginurl = new moodle_url('/login/index.php');