From 99aee9ca8df671d5545fc09fd94d0ff166a93d98 Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Mon, 7 Dec 2015 17:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E5=A4=84=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E5=86=99=E6=B3=95=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?Notice=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/error.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/library/think/error.php b/library/think/error.php
index de02e734..f3f5c756 100644
--- a/library/think/error.php
+++ b/library/think/error.php
@@ -20,11 +20,13 @@ class Error
      */
     public static function appException($e)
     {
-        $error['message'] = $e->getMessage();
-        $error['file']    = $e->getFile();
-        $error['line']    = $e->getLine();
-        $error['trace']   = $e->getTraceAsString();
-        $error['code']    = $e->getCode();
+        $error = [
+            'message'   => $e->getMessage(),
+            'file'      => $e->getFile(),
+            'line'      => $e->getLine(),
+            'trace'     => $e->getTraceAsString(),
+            'code'      => $e->getCode(),
+        ];
         // 记录异常日志
         Log::record($error['message'], 'ERR');
         // 发送404信息
@@ -98,9 +100,11 @@ class Error
             exit($message);
         } elseif (IS_API) {
             // API接口
-            $data['code'] = $code;
-            $data['msg']  = $message;
-            $data['time'] = NOW_TIME;
+            $data = [
+                'code'  => $code,
+                'msg'   => $message,
+                'time'  => NOW_TIME,
+            ];
             Response::returnData($data);
             exit();
         }