Revert "#930 modify Router class call position"

This reverts commit 2ecbec7296.
This commit is contained in:
bnu 2015-03-31 15:00:52 +09:00
parent 7daf31956c
commit 5636f0e111

View file

@ -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();