From e2fe61b7df1300b659e7671db17835603647e818 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Fri, 11 Dec 2009 20:49:53 +0000 Subject: [PATCH] Restore user language choice to compiled stylesheets. Broken by r10008 #54035 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10319 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c119677992..fa77cc83f7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -110,6 +110,7 @@
  • [Fix] Check for required functions in eAccelerator. (Bug #54465)
  • [Fix] Use correct RFC 3339 date format in ATOM feed. (Bug #55005)
  • [Fix] Do not deliver topics from unreadable or passworded forums in the news feed. (Bug #54345)
    • +
  • [Fix] Restore user language choice to compiled stylesheets. (Bug #54035)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
  • [Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)
    • diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 812b672c5c..690fed83e8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4154,7 +4154,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'] . '&lang=' . $user->data['user_lang']), + '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'] . '&lang=' . $user->data['user_lang'], true, $user->session_id), 'T_STYLESHEET_NAME' => $user->theme['theme_name'], 'T_THEME_NAME' => $user->theme['theme_path'],