From b543317bbdc962fbc89eea0848ccd1167f64f035 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 12 May 2015 15:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/controller.php | 4 ++--
 library/think/error.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/controller.php b/library/think/controller.php
index 42c3f056..2e00b472 100644
--- a/library/think/controller.php
+++ b/library/think/controller.php
@@ -115,7 +115,7 @@ class Controller {
         $result['msg']  = $msg;
         $result['time'] = NOW_TIME;
         $result['data'] = $data;
-        app::returnData($result,$type);
+        App::returnData($result,$type);
     }
 
     /**
@@ -126,7 +126,7 @@ class Controller {
      * @return void
      */
     protected function ajaxReturn($data, $type='') {
-        app::returnData($data,$type);
+        App::returnData($data,$type);
     }
 
     /**
diff --git a/library/think/error.php b/library/think/error.php
index 5cd27dd9..b6372aa1 100644
--- a/library/think/error.php
+++ b/library/think/error.php
@@ -93,7 +93,7 @@ class Error {
             $data['code']   =   $code;
             $data['msg']    =   $message;
             $data['time']   =   NOW_TIME;
-            app::returnData($data);
+            App::returnData($data);
         }
         $e = [];
         if (APP_DEBUG) {