From 00f469b38773864f186d7ff922cd06a8c48ea705 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 29 Dec 2015 20:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E5=A4=84=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E8=AD=A6=E5=91=8A=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/error.php b/library/think/error.php
index 31c5bfa8..a873ebbe 100644
--- a/library/think/error.php
+++ b/library/think/error.php
@@ -89,7 +89,7 @@ class Error
     public static function halt($error, $code = 1)
     {
         $message = is_array($error) ? $error['message'] : $error;
-        $code    = is_array($error) ? $error['code'] : $code;
+        $code    = isset($error['code']) ? $error['code'] : $code;
 
         if (APP_DEBUG) {
             //调试模式下输出错误信息