From 9f01dfa429209110467f95d858c070fba1504087 Mon Sep 17 00:00:00 2001
From: "xiaobo.sun" <5ini99@sohu.com>
Date: Wed, 24 Feb 2016 19:35:25 +0800
Subject: [PATCH] Update Input.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改通过delete协议时，无法获取到url上的参数问题
---
 library/think/Input.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/think/Input.php b/library/think/Input.php
index a1f4811c..28a565d5 100644
--- a/library/think/Input.php
+++ b/library/think/Input.php
@@ -72,6 +72,7 @@ class Input
         static $_DELETE = null;
         if (is_null($_DELETE)) {
             parse_str(file_get_contents('php://input'), $_DELETE);
+            $_DELETE = array_merge($_DELETE, $_GET);
         }
         return self::data($_DELETE, $name, $default, $filter, $merge);
     }