From 2ecbec7296655b3db33cc4b6f5e6b21bf6a88c1e Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 26 Aug 2014 12:34:15 +0900 Subject: [PATCH] #930 modify Router class call position --- classes/context/Context.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 7c0918a03..e055f320a 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -242,9 +242,18 @@ class Context } } + // check if using rewrite module + $this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE); + // If XE is installed, get virtual site information if(self::isInstalled()) { + // If using rewrite module, initializes router + if($this->allow_rewrite) + { + Router::proc(); + } + $oModuleModel = getModel('module'); $site_module_info = $oModuleModel->getDefaultMid(); @@ -363,15 +372,6 @@ class Context $this->lang = &$GLOBALS['lang']; $this->loadLang(_XE_PATH_ . 'common/lang/'); - // check if using rewrite module - $this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE); - - // If using rewrite module, initializes router - if($this->allow_rewrite) - { - Router::proc(); - } - // set locations for javascript use if($_SERVER['REQUEST_METHOD'] == 'GET') {