From 57d78c4dbd5d619369d6df7072eb60ea71db238c Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 8 Dec 2016 17:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/View.php b/library/think/View.php
index 52aa9cd7..6edd69a0 100644
--- a/library/think/View.php
+++ b/library/think/View.php
@@ -51,7 +51,7 @@ class View
             '__CSS__'    => $root . '/static/css',
             '__JS__'     => $root . '/static/js',
         ];
-        $this->replace = array_merge($baseReplace, $replace);
+        $this->replace = array_merge($baseReplace, (array) $replace);
     }
 
     /**