fix login name label for the case when system.verify_email is disabled

1 files changed, 9 insertions, 6 deletions

diff --git a/boot.php b/boot.php
index bb2d094ea..66ccd4309 100644
--- a/boot.php
+++ b/boot.php
@@ -1710,21 +1710,24 @@ function login($register = false, $form_id = 'main-login', $hiddens = false, $lo
 			$_SESSION['login_return_url'] = App::$query_string;
 	}
 
-	$o .= replace_macros($tpl,array(
+	$email_required = get_config('system', 'verify_email');
+	$lname_label = (($email_required) ? t('Email or nickname') : t('Nickname'));
+
+	$o .= replace_macros($tpl, [
 		'$dest_url'     => $dest_url,
 		'$login_page'   => $login_page,
 		'$logout'       => t('Logout'),
 		'$login'        => t('Login'),
 		'$remote_login' => t('Remote Authentication'),
 		'$form_id'      => $form_id,
-		'$lname'        => array('username', t('Login/Email') , '', ''),
-		'$lpassword'    => array('password', t('Password'), '', ''),
-		'$remember_me'  => array((($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '',array(t('No'),t('Yes'))),
+		'$lname'        => ['username', $lname_label],
+		'$lpassword'    => ['password', t('Password')],
+		'$remember_me'  => [(($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '', [t('No'),t('Yes')]],
 		'$hiddens'      => $hiddens,
 		'$register'     => $reg,
 		'$lostpass'     => t('Forgot your password?'),
-		'$lostlink'     => t('Password Reset'),
-	));
+		'$lostlink'     => (($email_required) ? t('Password Reset') : ''),
+	]);
 
 	/**
 	 * @hooks login_hook