aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-11 01:41:22 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-11 01:41:22 +0200
commit08a34ebe948b4cc4b6f53572a65da23f55613181 (patch)
tree5c926f41d09de135092d32dd09b0ee4b507c3403 /phpBB/includes/functions.php
parente46745ed34386c5884c7dacb1f3d8a8ca0c333dd (diff)
parentc40b2c76015094283aa87f6b3c6ddea283bf3e42 (diff)
downloadforums-08a34ebe948b4cc4b6f53572a65da23f55613181.tar
forums-08a34ebe948b4cc4b6f53572a65da23f55613181.tar.gz
forums-08a34ebe948b4cc4b6f53572a65da23f55613181.tar.bz2
forums-08a34ebe948b4cc4b6f53572a65da23f55613181.tar.xz
forums-08a34ebe948b4cc4b6f53572a65da23f55613181.zip
Merge branch 'ticket/jellydoughnut/9629' into develop-olympus
* ticket/jellydoughnut/9629: [ticket/9629] Allow style.php to retrieve its session ID from cookies
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3f097f171f..9c74a524ee 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4318,7 +4318,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
'T_ICONS_PATH' => "{$web_path}{$config['icons_path']}/",
'T_RANKS_PATH' => "{$web_path}{$config['ranks_path']}/",
'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/",
- 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&amp;lang=' . $user->data['user_lang'], true, $user->session_id),
+ 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&amp;lang=' . $user->data['user_lang']),
'T_STYLESHEET_NAME' => $user->theme['theme_name'],
'T_THEME_NAME' => $user->theme['theme_path'],