diff --git a/application/common/controller/User.php b/application/common/controller/User.php index 1ba01651..9d43244d 100644 --- a/application/common/controller/User.php +++ b/application/common/controller/User.php @@ -14,7 +14,7 @@ class User extends Front { public function _initialize() { parent::_initialize(); - if (!is_login() and !in_array($this->url, array('user/login/index', 'user/index/verify'))) { + if (!is_login() and !in_array($this->url_path, array('user/login/index', 'user/index/verify'))) { return $this->redirect('user/login/index'); } elseif (is_login()) { $user = model('User')->getInfo(session('user_auth.uid')); diff --git a/application/install/config.php b/application/install/config.php index bb54f548..0086d39e 100644 --- a/application/install/config.php +++ b/application/install/config.php @@ -2,12 +2,6 @@ return array( 'view_replace_str' => array( - '__ADDONS__' => BASE_PATH . '/addons', - '__PUBLIC__' => BASE_PATH . '/public', - '__STATIC__' => BASE_PATH . '/application/admin/static', - '__IMG__' => BASE_PATH . '/application/admin/static/images', - '__CSS__' => BASE_PATH . '/application/admin/static/css', - '__JS__' => BASE_PATH . '/application/admin/static/js', '__COMPANY__' => '南昌腾速科技有限公司', '__NAME__' => 'SentCMS网站管理系统', '__COMPANY_WEBSITE__' => 'www.tensent.cn', diff --git a/application/install/view/public/base.html b/application/install/view/public/base.html index 4b8eb365..0f390d40 100644 --- a/application/install/view/public/base.html +++ b/application/install/view/public/base.html @@ -7,8 +7,8 @@ - - + +