diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/template.php | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3e1c36bb14..6d5c404121 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1347,18 +1347,18 @@ function page_header($page_title = '') 'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0, 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, - 'T_THEME_PATH' => 'styles/themes/' . $user->theme['primary']['theme_path'], - 'T_STYLESHEET_LINK' => (!$user->theme['primary']['css_storedb']) ? 'styles/themes/' . $user->theme['primary']['theme_path'] . '/' . $user->theme['primary']['theme_name'] . '.css' : '', + 'T_THEME_PATH' => 'styles/' . $user->theme['primary']['theme_path'] . '/theme/', + 'T_STYLESHEET_LINK' => (!$user->theme['primary']['css_storedb']) ? 'styles/' . $user->theme['primary']['theme_path'] . '/theme/stylesheet.css' : "style.$phpEx?sid=$user->session_id&id=" . $user->theme['primary']['theme_id'], 'T_THEME_DATA' => (!$user->theme['primary']['css_storedb']) ? '' : $user->theme['primary']['css_data']) ); if (!empty($config['send_encoding'])) { - header ('Content-type: text/html; charset: ' . $user->lang['ENCODING']); + header('Content-type: text/html; charset: ' . $user->lang['ENCODING']); } - header ('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0'); - header ('Expires: 0'); - header ('Pragma: no-cache'); + header('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0'); + header('Expires: 0'); + header('Pragma: no-cache'); return; } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 052ccd5fb4..e24e29ac58 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -498,7 +498,7 @@ class user extends session $template->set_template(); - $this->img_lang = (file_exists($phpbb_root_path . 'styles/imagesets/' . $this->theme['default']['imageset_path'] . '/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; + $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['default']['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; return; } diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 3c765a03a2..d7de109602 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -68,16 +68,16 @@ class template { global $phpbb_root_path, $config, $user; - if (file_exists($phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path'])) + if (file_exists($phpbb_root_path . 'styles/' . $user->theme['primary']['template_path'] . '/template')) { // $this->tpl = 'primary'; - $this->root = $phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path']; + $this->root = $phpbb_root_path . 'styles/' . $user->theme['primary']['template_path']. '/template'; $this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['primary']['template_path'] . '_'; } else { // $this->tpl = 'secondary'; - $this->root = $phpbb_root_path . 'styles/templates/' . $user->theme['secondary']['template_path']; + $this->root = $phpbb_root_path . 'styles/' . $user->theme['secondary']['template_path']. '/template'; $this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['secondary']['template_path'] . '_'; } @@ -166,7 +166,7 @@ class template if (!file_exists($this->files[$handle])) { // $this->tpl = 'secondary'; - $this->files[$handle] = $phpbb_root_path . 'styles/templates/' . $user->theme['secondary']['template_path'] . '/' . $this->filename[$handle]; + $this->files[$handle] = $phpbb_root_path . 'styles/' . $user->theme['secondary']['template_path'] . '/template/' . $this->filename[$handle]; } $str = ''; |