From 5048f7c767ef67294983646b0e1c5ce46a4e5894 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 2 Jun 2016 12:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Response=E7=B1=BB=E7=9A=84sen?=
 =?UTF-8?q?d=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Response.php b/library/think/Response.php
index 91ab6d8b..d3d6d7eb 100644
--- a/library/think/Response.php
+++ b/library/think/Response.php
@@ -104,7 +104,7 @@ class Response
      */
     public function send($data = null)
     {
-        $data = !is_null($data) ?: $this->data;
+        $data = !is_null($data) ? $data : $this->data;
 
         if (isset($this->contentType)) {
             $this->contentType($this->contentType);