Merge commit '99212ec78743317bf52063fb165b90fceb70de5e' into dev
# Conflicts: # admin/login.php
This commit is contained in:
+2
-2
@@ -16,8 +16,8 @@ include 'header.php';
|
||||
<h1><a href="https://typecho.org" class="i-logo">Typecho</a></h1>
|
||||
<form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
|
||||
<p>
|
||||
<label for="name" class="sr-only"><?php _e('用户名'); ?></label>
|
||||
<input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" autofocus required />
|
||||
<label for="name" class="sr-only"><?php _e('用户名或邮箱'); ?></label>
|
||||
<input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名或邮箱'); ?>" class="text-l w-100" autofocus />
|
||||
</p>
|
||||
<p>
|
||||
<label for="password" class="sr-only"><?php _e('密码'); ?></label>
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ include 'common.php';
|
||||
if ($user->hasLogin() || !$options->allowRegister) {
|
||||
$response->redirect($options->siteUrl);
|
||||
}
|
||||
$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name'));
|
||||
$rememberMail = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_mail'));
|
||||
$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name', ''));
|
||||
$rememberMail = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_mail', ''));
|
||||
\Typecho\Cookie::delete('__typecho_remember_name');
|
||||
\Typecho\Cookie::delete('__typecho_remember_mail');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user