From dea2a7203893a00f27c1dee5ce3dfa605195b9d4 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 28 Jun 2016 19:31:48 +0800
Subject: [PATCH] =?UTF-8?q?Template=E7=B1=BB=E6=94=B9=E8=BF=9B=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=A7=A3=E6=9E=90=E5=A2=9E=E5=8A=A0=20$Request.=20?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=8F=98=E9=87=8F=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Template.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/think/Template.php b/library/think/Template.php
index bada4d2f..56a27453 100644
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -559,7 +559,7 @@ class Template
                     } elseif (!empty($val['parent'])) {
                         // 如果子标签没有被继承则用原值
                         $children[$val['parent']][] = $name;
-                        $blocks[$name] = $val;
+                        $blocks[$name]              = $val;
                     }
                     if (!$val['parent']) {
                         // 替换模板中的顶级block标签
@@ -854,6 +854,11 @@ class Template
                         if ('$Think' == $first) {
                             // 所有以Think.打头的以特殊变量对待 无需模板赋值就可以输出
                             $parseStr = $this->parseThinkVar($vars);
+                        } elseif ('$Request' == $first) {
+                            // 获取Request请求对象参数
+                            $method   = array_shift($vars);
+                            $params   = !empty($vars) ? '\'' . implode('.', $vars) . '\'' : '';
+                            $parseStr = '\think\Request::instance()->' . $method . '(' . $params . ')';
                         } else {
                             switch ($this->config['tpl_var_identify']) {
                                 case 'array': // 识别为数组