Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/sko…

…dak/moodle
moodle · Jul 28, 2014 · 62d6161 · 62d6161
2 parents 9834bce + 1f5be49
commit 62d6161
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
@@ -70,10 +70,15 @@ function get_content () {
         $this->content->text = '';
 
         if (!isloggedin() or isguestuser()) {   // Show the block
+            if (empty($CFG->authloginviaemail)) {
+                $strusername = get_string('username');
+            } else {
+                $strusername = get_string('usernameemail');
+            }
 
             $this->content->text .= "\n".'<form class="loginform" id="login" method="post" action="'.get_login_url().'" '.$autocomplete.'>';
 
-            $this->content->text .= '<div class="c1 fld username"><label for="login_username">'.get_string('username').'</label>';
+            $this->content->text .= '<div class="c1 fld username"><label for="login_username">'.$strusername.'</label>';
             $this->content->text .= '<input type="text" name="username" id="login_username" value="'.s($username).'" /></div>';
 
             $this->content->text .= '<div class="c1 fld password"><label for="login_password">'.get_string('password').'</label>';