From 454ffef88e39b7ff486303ba0f0c86aa6914c686 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 4 Aug 2016 12:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BApp=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/App.php b/library/think/App.php
index 30350e3a..70296a3d 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -483,10 +483,16 @@ class App
             // 开启路由
             if (is_file(RUNTIME_PATH . 'route.php')) {
                 // 读取路由缓存
-                Route::rules(include RUNTIME_PATH . 'route.php' ?: []);
+                $rules = include RUNTIME_PATH . 'route.php';
+                if (is_array($rules)) {
+                    Route::rules($rules);
+                }
             } elseif (is_file(CONF_PATH . 'route' . CONF_EXT)) {
                 // 导入路由配置
-                Route::import(include CONF_PATH . 'route' . CONF_EXT ?: []);
+                $rules = include CONF_PATH . 'route' . CONF_EXT;
+                if (is_array($rules)) {
+                    Route::import($rules);
+                }
             }
             // 路由检测（根据路由定义返回不同的URL调度）
             $result = Route::check($request, $path, $depr, $config['url_domain_deploy']);