From 357f1706e570f933bef7b51cf82dfc3b47b43f34 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 28 Nov 2016 16:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=88=B0=E7=B1=BB=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E7=9A=84=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E7=9A=84=E9=A2=9D=E5=A4=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=9A=E5=92=8C=E5=BD=93=E5=89=8D=E8=AF=B7=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=88=E5=B9=B6=E4=BC=A0=E5=85=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index de96e1b4..2f0c57aa 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -141,11 +141,13 @@ class App
                     break;
                 case 'controller':
                     // 执行控制器操作
-                    $data = Loader::action($dispatch['controller'], $dispatch['var']);
+                    $vars = Request::instance()->param();
+                    $data = Loader::action($dispatch['controller'], array_merge($vars, $dispatch['var']));
                     break;
                 case 'method':
                     // 执行回调方法
-                    $data = self::invokeMethod($dispatch['method'], $dispatch['var']);
+                    $vars = Request::instance()->param();
+                    $data = self::invokeMethod($dispatch['method'], array_merge($vars, $dispatch['var']));
                     break;
                 case 'function':
                     // 执行闭包