From ab5dfcf111f991eea16a79da2ffe0d42daa7ccac Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 20 Jul 2016 12:20:38 +0800
Subject: [PATCH] =?UTF-8?q?view=E5=8A=A9=E6=89=8B=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0replace=E5=8F=82=E6=95=B0=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88ViewResponse=E7=B1=BB=E7=9A=84vars=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=20=E4=BD=BF=E7=94=A8assign=E6=96=B9=E6=B3=95=E6=9B=BF=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php                         |  5 +++--
 library/think/exception/Handle.php | 10 +++++-----
 library/think/response/View.php    | 18 +++---------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/helper.php b/helper.php
index e0af9dca..703cc273 100644
--- a/helper.php
+++ b/helper.php
@@ -421,12 +421,13 @@ if (!function_exists('view')) {
      * 渲染模板输出
      * @param string    $template 模板文件
      * @param array     $vars 模板变量
+     * @param array     $replace 模板替换
      * @param integer   $code 状态码
      * @return \think\response\View
      */
-    function view($template = '', $vars = [], $code = 200)
+    function view($template = '', $vars = [], $replace = [], $code = 200)
     {
-        return Response::create($template, 'view', $code)->vars($vars);
+        return Response::create($template, 'view', $code)->replace($replace)->assign($vars);
     }
 }
 
diff --git a/library/think/exception/Handle.php b/library/think/exception/Handle.php
index a598df8c..fefdef00 100644
--- a/library/think/exception/Handle.php
+++ b/library/think/exception/Handle.php
@@ -44,13 +44,13 @@ class Handle
                     'message' => $this->getMessage($exception),
                     'code'    => $this->getCode($exception),
                 ];
-                $log  = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
+                $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
             } else {
                 $data = [
                     'code'    => $this->getCode($exception),
                     'message' => $this->getMessage($exception),
                 ];
-                $log  = "[{$data['code']}]{$data['message']}";
+                $log = "[{$data['code']}]{$data['message']}";
             }
 
             Log::record($log, 'error');
@@ -103,7 +103,7 @@ class Handle
         $status   = $e->getStatusCode();
         $template = Config::get('http_exception_template');
         if (!App::$debug && !empty($template[$status])) {
-            return Response::create($template[$status], 'view')->vars(['e' => $e]);
+            return Response::create($template[$status], 'view')->assign(['e' => $e]);
         } else {
             return $this->convertExceptionToResponse($e);
         }
@@ -155,9 +155,9 @@ class Handle
         while (ob_get_level() > 1) {
             ob_end_clean();
         }
-        
+
         $data['echo'] = ob_get_clean();
-        
+
         ob_start();
         extract($data);
         include Config::get('exception_tmpl');
diff --git a/library/think/response/View.php b/library/think/response/View.php
index 224e3b60..3a5f3660 100644
--- a/library/think/response/View.php
+++ b/library/think/response/View.php
@@ -36,18 +36,6 @@ class View extends Response
             ->fetch($data, $this->vars, $this->replace);
     }
 
-    /**
-     * 视图变量赋值
-     * @access public
-     * @param array $vars 模板变量
-     * @return $this
-     */
-    public function vars($vars = [])
-    {
-        $this->vars = $vars;
-        return $this;
-    }
-
     /**
      * 获取视图变量
      * @access public
@@ -56,11 +44,11 @@ class View extends Response
      */
     public function getVars($name = null)
     {
-        if(is_null($name)){
+        if (is_null($name)) {
             return $this->vars;
-        }else{
+        } else {
             return isset($this->vars[$name]) ? $this->vars[$name] : null;
-        }        
+        }
     }
 
     /**