From 6de401ab498a1ebd68998e1596fe2519bf6f86d6 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Fri, 28 Feb 2014 10:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=B7=A8=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/login.php        | 2 +-
 admin/register.php     | 4 ++--
 var/Widget/Archive.php | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/admin/login.php b/admin/login.php
index f34ecf4f..119f674e 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -4,7 +4,7 @@ include 'common.php';
 if ($user->hasLogin()) {
     $response->redirect($options->adminUrl);
 }
-$rememberName = Typecho_Cookie::get('__typecho_remember_name');
+$rememberName = htmlspecialchars(Typecho_Cookie::get('__typecho_remember_name'));
 Typecho_Cookie::delete('__typecho_remember_name');
 
 $bodyClass = 'body-100';
diff --git a/admin/register.php b/admin/register.php
index 84b5f932..5c8a11c6 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -4,8 +4,8 @@ include 'common.php';
 if ($user->hasLogin() || !$options->allowRegister) {
     $response->redirect($options->siteUrl);
 }
-$rememberName = Typecho_Cookie::get('__typecho_remember_name');
-$rememberMail = 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');
 
diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
index dd382234..a45311d3 100644
--- a/var/Widget/Archive.php
+++ b/var/Widget/Archive.php
@@ -1754,14 +1754,14 @@ var TypechoComment = {
      *
      * @access public
      * @param string $cookieName 已经记忆的cookie名称
-     * @param string $return 是否返回
+     * @param boolean $return 是否返回
      * @return string
      */
     public function remember($cookieName, $return = false)
     {
         $cookieName = strtolower($cookieName);
         if (!in_array($cookieName, array('author', 'mail', 'url'))) {
-            return;
+            return '';
         }
     
         $value = Typecho_Cookie::get('__typecho_remember_' . $cookieName);
@@ -1797,7 +1797,6 @@ var TypechoComment = {
      * 输出关键字
      *
      * @access public
-     * @return unknown
      */
     public function keywords($split = ',', $default = '')
     {