From 63010c78863b14b45469ccf59058a75897c9926b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 Mar 2016 10:44:22 +0800 Subject: [PATCH] * fix for load siteCode config. --- framework/base/control.class.php | 1 - framework/base/router.class.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/base/control.class.php b/framework/base/control.class.php index 26562c9e8f..662a01cff4 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -591,7 +591,6 @@ class baseControl $this->output = json_encode($output); } - /** /** * 默认渲染方法,适用于viewType = html的时候。 * Default parse method when viewType != json, like html. diff --git a/framework/base/router.class.php b/framework/base/router.class.php index 1594c1b58e..0ebc0ace3f 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -1709,7 +1709,7 @@ class baseRouter if(is_file($multiConfigFile)) include $multiConfigFile; } - if(empty($this->siteCode)) + if(!empty($this->siteCode)) { $siteConfigFile = $this->configRoot . "sites/{$this->siteCode}.php"; if(is_file($siteConfigFile)) include $siteConfigFile;