From fdf9196d58ab745444666bd3d4d0bb46e1b8b5b3 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Sun, 9 Feb 2014 01:18:31 +0800
Subject: [PATCH] fix #182

---
 admin/login.php | 2 +-
 var/Json.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/login.php b/admin/login.php
index 6ceb43b5..3dee717c 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -28,7 +28,7 @@ include 'header.php';
                 <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
             </p>
             <p>
-                <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label>
+                <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('下次自动登录'); ?></label>
             </p>
         </form>
         
diff --git a/var/Json.php b/var/Json.php
index 6adf0f8b..7a602a4c 100644
--- a/var/Json.php
+++ b/var/Json.php
@@ -528,7 +528,7 @@ class Json
     {
         if (function_exists('json_decode')) {
             /** from php 5.1 */
-            $result = json_decode($var);
+            return json_decode($var, $assoc);
         } else {
             $result = self::_decode($var);
         }