aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-06-04 07:44:37 +0000
committerMario <mario@mariovavti.com>2021-06-04 07:44:37 +0000
commit3d1684fa942812e2d6f053cbfb6de9fdc00ea79c (patch)
tree0809eba89f4ed7248d9af04c8e84ef1b1412fb72 /boot.php
parentd882bad706542eb1e64c24567b8bf112f6cebb89 (diff)
downloadvolse-hubzilla-3d1684fa942812e2d6f053cbfb6de9fdc00ea79c.tar.gz
volse-hubzilla-3d1684fa942812e2d6f053cbfb6de9fdc00ea79c.tar.bz2
volse-hubzilla-3d1684fa942812e2d6f053cbfb6de9fdc00ea79c.zip
Revert "fix login name label for the case when system.verify_email is disabled"
This reverts commit d882bad706542eb1e64c24567b8bf112f6cebb89.
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php15
1 files changed, 6 insertions, 9 deletions
diff --git a/boot.php b/boot.php
index 66ccd4309..bb2d094ea 100644
--- a/boot.php
+++ b/boot.php
@@ -1710,24 +1710,21 @@ function login($register = false, $form_id = 'main-login', $hiddens = false, $lo
$_SESSION['login_return_url'] = App::$query_string;
}
- $email_required = get_config('system', 'verify_email');
- $lname_label = (($email_required) ? t('Email or nickname') : t('Nickname'));
-
- $o .= replace_macros($tpl, [
+ $o .= replace_macros($tpl,array(
'$dest_url' => $dest_url,
'$login_page' => $login_page,
'$logout' => t('Logout'),
'$login' => t('Login'),
'$remote_login' => t('Remote Authentication'),
'$form_id' => $form_id,
- '$lname' => ['username', $lname_label],
- '$lpassword' => ['password', t('Password')],
- '$remember_me' => [(($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '', [t('No'),t('Yes')]],
+ '$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'))),
'$hiddens' => $hiddens,
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
- '$lostlink' => (($email_required) ? t('Password Reset') : ''),
- ]);
+ '$lostlink' => t('Password Reset'),
+ ));
/**
* @hooks login_hook