From a6c1de5f89181269d924a127f26a3f52109ac415 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 18 Mar 2016 08:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3error=5Fpage=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Error.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/library/think/Error.php b/library/think/Error.php
index a080a0c2..0f237aed 100644
--- a/library/think/Error.php
+++ b/library/think/Error.php
@@ -71,15 +71,13 @@ class Error
         Log::record($log, 'error');
 
         /* 非API模式下的部署模式，跳转到指定的 Error Page */
-        if (!(APP_DEBUG || IS_API)) {
-            $error_page = Config::get('error_page');
-            if (!empty($error_page)) {
-                header("Location: {$error_page}");
-            }
+        $error_page = Config::get('error_page');
+        if (!(APP_DEBUG || IS_API) && !empty($error_page)) {
+            header("Location: {$error_page}");
+        } else {
+            // 输出错误信息
+            self::output($exception, $data);
         }
-
-        // 输出错误信息
-        self::output($exception, $data);
         // 禁止往下传播已处理过的异常
         return true;
     }