From af4e544937e87fb4f3445be636313a7fba3ca4e8 Mon Sep 17 00:00:00 2001
From: jay <917647288@qq.com>
Date: Tue, 14 Jun 2016 15:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=98=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/log/driver/Browser.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/library/think/log/driver/Browser.php b/library/think/log/driver/Browser.php
index 66106846..9b068466 100644
--- a/library/think/log/driver/Browser.php
+++ b/library/think/log/driver/Browser.php
@@ -1,5 +1,13 @@
 <?php
-
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yangweijie <yangweijiester@gmail.com>
+// +----------------------------------------------------------------------
 namespace think\log\driver;
 use think\Cache;
 use think\Config;
@@ -116,14 +124,11 @@ JS;
         foreach ($msg as $key => $m) {
             switch ($type) {
                 case '调试':
-                    //我多么希望进来的是原数据格式而不是字符串
-                    if(substr($m, 0, 5) == 'array'){
-                        eval("\$o = $m;");
-                        $line[]  = "console.log(".json_encode($o).");";
+                    $var_type = gettype($m);
+                    if(in_array($var_type, ['array', 'string'])){
+                        $line[]  = "console.log(".json_encode($m).");";
                     }else{
-                        $msg = addslashes($m);
-                        $msg = str_replace(PHP_EOL, '\n', $msg);
-                        $line[] = "console.log('$msg');";
+                        $line[]  = "console.log(".json_encode(var_export($m, 1)).");";
                     }
                     break;
                 case '错误':