From 3918ca395291bb73fb5b7d3ab2bda843e6e648dd Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 15 Mar 2016 23:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E6=A8=A1=E6=9D=BF=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/View.php  | 2 +-
 tpl/think_exception.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/View.php b/library/think/View.php
index cff28228..6bc08d20 100644
--- a/library/think/View.php
+++ b/library/think/View.php
@@ -169,7 +169,7 @@ class View
     public function fetch($template = '', $vars = [], $config = [], $renderContent = false)
     {
         // 模板变量
-        $vars = $vars ? $vars : $this->data;
+        $vars = array_merge($this->data, $vars);
         if (!$renderContent) {
             // 获取模板文件名
             $template = $this->parseTemplate($template);
diff --git a/tpl/think_exception.tpl b/tpl/think_exception.tpl
index df1eb395..6c719fd8 100644
--- a/tpl/think_exception.tpl
+++ b/tpl/think_exception.tpl
@@ -13,7 +13,7 @@
             padding: 20px;
         }
         h1{
-            margin: 0;
+            margin: 10px 0 0;
             font-size: 28px;
             font-weight: 500;
             line-height: 32px;
@@ -22,7 +22,7 @@
             color: #4288ce;
             font-weight: 400;
             padding: 6px 0;
-            margin: 10px 6px 0 0;
+            margin: 6px 0 0;
             font-size: 18px;
             border-bottom: 1px solid #eee;
         }