From a248444605b110f597b32b20d3f82b3a55be6e15 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 1 Apr 2013 13:25:56 +0800
Subject: [PATCH] =?UTF-8?q?Think\Error=E7=B1=BB=E7=9A=84appShutdown?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Cache.php  | 2 +-
 Think/Error.php  | 1 +
 Think/Loader.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Think/Cache.php b/Think/Cache.php
index a0ea0250..930307fa 100644
--- a/Think/Cache.php
+++ b/Think/Cache.php
@@ -31,7 +31,7 @@ class Cache {
             self::$handler = new $class($options);
             return self::$handler;
         }else{
-            Error::halt('_CACHE_TYPE_INVALID_:'.$type);
+            E('_CACHE_TYPE_INVALID_:'.$type);
         }
     }
 
diff --git a/Think/Error.php b/Think/Error.php
index d16d88ef..66ab8b6b 100644
--- a/Think/Error.php
+++ b/Think/Error.php
@@ -64,6 +64,7 @@ class Error {
         // 记录日志
         Log::save();
         if ($e = error_get_last()) {
+            ob_end_clean();
             self::appError($e['type'],$e['message'],$e['file'],$e['line']);
         }
     }
diff --git a/Think/Loader.php b/Think/Loader.php
index b019483a..9ad50a8d 100644
--- a/Think/Loader.php
+++ b/Think/Loader.php
@@ -235,7 +235,7 @@ class Loader {
                     self::$_instance[$identify] = $o;
             }
             else
-                Error::halt(Lang::get('_CLASS_NOT_EXIST_').':'.$class);
+                E(Lang::get('_CLASS_NOT_EXIST_').':'.$class);
         }
         return self::$_instance[$identify];
     }