From 5636f0e11106cb5a5a2754e827ec8bdcb9c56f36 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 31 Mar 2015 15:00:52 +0900 Subject: [PATCH] Revert "#930 modify Router class call position" This reverts commit 2ecbec7296655b3db33cc4b6f5e6b21bf6a88c1e. --- 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 4cedb6357..8f490cd7d 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -242,18 +242,9 @@ 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(); @@ -372,6 +363,15 @@ 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 $url = array(); $current_url = self::getRequestUri();