From 02b3d6fa0ecbd6a54a10f13b19631d448604afb3 Mon Sep 17 00:00:00 2001
From: "xiaobo.sun" <5ini99@sohu.com>
Date: Thu, 30 Jun 2016 16:30:51 +0800
Subject: [PATCH] Update Jsonp.php (#185)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当url_common_param为false时是无法获取到$_GET的数据的，故使用Request来获取
---
 library/think/response/Jsonp.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/think/response/Jsonp.php b/library/think/response/Jsonp.php
index 04f0c897..b6806575 100644
--- a/library/think/response/Jsonp.php
+++ b/library/think/response/Jsonp.php
@@ -11,6 +11,7 @@
 
 namespace think\response;
 
+use think\Request;
 use think\Response;
 
 class Jsonp extends Response
@@ -32,8 +33,9 @@ class Jsonp extends Response
      */
     protected function output($data)
     {
-        // 返回JSON数据格式到客户端 包含状态信息
-        $handler = !empty($_GET[$this->options['var_jsonp_handler']]) ? $_GET[$this->options['var_jsonp_handler']] : $this->options['default_jsonp_handler'];
+        // 返回JSON数据格式到客户端 包含状态信息 [当url_common_param为false时是无法获取到$_GET的数据的，故使用Request来获取<xiaobo.sun@qq.com>]
+        $var_jsonp_handler = Request::instance()->param($this->options['var_jsonp_handler'], "");
+        $handler = !empty($var_jsonp_handler) ? $var_jsonp_handler : $this->options['default_jsonp_handler'];
         $data    = $handler . '(' . json_encode($data, $this->options['json_encode_param']) . ');';
         return $data;
     }