aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-18 14:17:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-18 14:17:39 +0000
commit2fc6d5147afc6c6c3827d698a71dcb210524d51e (patch)
treefca654d38b28072dce3d17128f7fe4762e251176 /phpBB/includes/functions.php
parente2736dea20d623f0484a017c0504c4d8f822c908 (diff)
downloadforums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar
forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.gz
forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.bz2
forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.xz
forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.zip
Set secure cookie for style switcher if required. (Bug #19625)
git-svn-id: file:///svn/phpbb/trunk@8875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3e4ce3474a..8fef702ab1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3597,8 +3597,10 @@ function page_header($page_title = '', $display_online_list = true)
'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? PHPBB_ROOT_PATH . 'styles/' . $user->theme['theme_path'] . '/theme/stylesheet.css' : PHPBB_ROOT_PATH . 'style.' . PHP_EXT . "?sid=$user->session_id&amp;id=" . $user->theme['style_id'] . '&amp;lang=' . $user->data['user_lang'], //PHPBB_ROOT_PATH . "store/{$user->theme['theme_id']}_{$user->theme['imageset_id']}_{$user->lang_name}.css"
'T_STYLESHEET_NAME' => $user->theme['theme_name'],
- 'SITE_LOGO_IMG' => $user->img('site_logo'))
- );
+ 'SITE_LOGO_IMG' => $user->img('site_logo'),
+
+ 'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
+ ));
// application/xhtml+xml not used because of IE
header('Content-type: text/html; charset=UTF-8');