From accc680e4bc881464f70080cad48c541e64465bb Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 27 Dec 2015 22:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=99=E6=80=81=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8callback=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/loader.php | 4 +++-
 start.php                | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/think/loader.php b/library/think/loader.php
index 34a0608f..f69c08dd 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -75,8 +75,10 @@ class Loader
     // 注册自动加载机制
     public static function register($autoload = '')
     {
+        // 注册系统自动加载
+        spl_autoload_register($autoload ? $autoload : 'think\\loader::autoload');
+        // 注册composer自动加载
         self::registerComposerLoader();
-        spl_autoload_register($autoload ? $autoload : ['think\\loader', 'autoload']);
     }
 
     // 注册composer自动加载
diff --git a/start.php b/start.php
index 90135a8c..a4570cb0 100644
--- a/start.php
+++ b/start.php
@@ -20,9 +20,9 @@ require CORE_PATH . 'loader.php';
 Loader::register();
 
 // 注册错误和异常处理机制
-register_shutdown_function(['think\Error', 'appShutdown']);
-set_error_handler(['think\Error', 'appError']);
-set_exception_handler(['think\Error', 'appException']);
+register_shutdown_function('think\Error::appShutdown');
+set_error_handler('think\Error::appError');
+set_exception_handler('think\Error::appException');
 
 // 加载模式定义文件
 $mode = require MODE_PATH . APP_MODE . EXT;