From 834bcdaedac762b1a5961cb5b57aef94c92d7528 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 3 Jul 2017 09:39:12 +0800 Subject: [PATCH] * adjust for framework. --- framework/base/router.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/base/router.class.php b/framework/base/router.class.php index aafd15a72a..0222aa9647 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -364,14 +364,15 @@ class baseRouter $this->setTimezone(); $this->startSession(); + if($this->config->framework->multiSite) $this->setSiteCode() && $this->loadExtraConfig(); if($this->config->framework->autoConnectDB) $this->connectDB(); - if($this->config->framework->multiLanguage) $this->setClientLang() && $this->loadLang('common'); + if($this->config->framework->multiLanguage) $this->setClientLang(); $needDetectDevice = zget($this->config->framework->detectDevice, $this->clientLang, false); $this->clientDevice = $needDetectDevice ? $this->setClientDevice() : 'desktop'; - if($this->config->framework->multiTheme) $this->setClientTheme(); - if($this->config->framework->multiSite) $this->setSiteCode() && $this->loadExtraConfig(); + if($this->config->framework->multiLanguage) $this->loadLang('common'); + if($this->config->framework->multiTheme) $this->setClientTheme(); } /**