From 830c3f4047d0718ed398c38d4640cc0f1fe77a7f Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 3 Sep 2011 23:50:00 +0300 Subject: [feature/remove-imagesets] Adjustments to php files Removing imagesets. Adjustments to php files PHPBB3-10336 --- phpBB/includes/functions.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 47ff270b76..b143ffd39d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4557,6 +4557,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 '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->lang_name), + 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/' . $user->lang_name . '/stylesheet.css', 'T_STYLESHEET_NAME' => $user->theme['theme_name'], 'T_THEME_NAME' => $user->theme['theme_path'], -- cgit v1.2.1 From 9006984d5ab7478e9187d14c5ab331057b1af9a4 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 18 Sep 2011 22:20:20 +0200 Subject: [ticket/10369] DRY code to remove phpbb path from errfile. PHPBB3-10369 --- phpBB/includes/functions.php | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 628f8ee123..4c1bfb4360 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3816,9 +3816,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { - // remove complete path to installation, with the risk of changing backslashes meant to be there - $errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile); - $msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text); + $errfile = phpbb_filter_errfile($errfile); + $msg_text = phpbb_filter_errfile($msg_text); $error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice'; echo '[phpBB Debug] ' . $error_name . ': in file ' . $errfile . ' on line ' . $errline . ': ' . $msg_text . '
' . "\n"; @@ -3996,6 +3995,27 @@ function msg_handler($errno, $msg_text, $errfile, $errline) return false; } +/** +* Removes absolute path to phpBB root directory from error messages +* and converts backslashes to forward slashes. +* +* @param string $errfile Absolute file path +* (e.g. /var/www/phpbb3/phpBB/includes/functions.php) +* @return string Relative file path +* (e.g. /includes/functions.php) +*/ +function phpbb_filter_errfile($errfile) +{ + static $root_path; + + if (empty($root_path)) + { + $root_path = phpbb_realpath(dirname(__FILE__) . '/../'); + } + + return str_replace(array($root_path, '\\'), array('', '/'), $errfile); +} + /** * Queries the session table to get information about online guests * @param int $item_id Limits the search to the item with this id -- cgit v1.2.1 From 1ad97424a469fe2e36a3c3a616b5e49def292779 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 18 Sep 2011 22:32:25 +0200 Subject: [ticket/10369] Rename filter_errfile() to filter_root_path(). PHPBB3-10369 --- phpBB/includes/functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4c1bfb4360..cd856f55a7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3816,8 +3816,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { - $errfile = phpbb_filter_errfile($errfile); - $msg_text = phpbb_filter_errfile($msg_text); + $errfile = phpbb_filter_root_path($errfile); + $msg_text = phpbb_filter_root_path($msg_text); $error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice'; echo '[phpBB Debug] ' . $error_name . ': in file ' . $errfile . ' on line ' . $errline . ': ' . $msg_text . '
' . "\n"; @@ -4004,7 +4004,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) * @return string Relative file path * (e.g. /includes/functions.php) */ -function phpbb_filter_errfile($errfile) +function phpbb_filter_root_path($errfile) { static $root_path; -- cgit v1.2.1 From c8564e6ce98980143c42a67b51b0c8327cfc12b5 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 18 Sep 2011 22:41:02 +0200 Subject: [ticket/10369] Add warning about paths outside of phpBB root not being filtered PHPBB3-10369 --- phpBB/includes/functions.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index cd856f55a7..2e445192ae 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4001,6 +4001,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) * * @param string $errfile Absolute file path * (e.g. /var/www/phpbb3/phpBB/includes/functions.php) +* Please note that if $errfile is outside of the phpBB root, +* the root path will not be found and can not be filtered. * @return string Relative file path * (e.g. /includes/functions.php) */ -- cgit v1.2.1 From 1b390f0b498f1eb977dd62dc06dd5753b0c7ea65 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 18 Sep 2011 23:03:28 +0200 Subject: [ticket/10369] Replace root path with "[ROOT]" as per IRC. PHPBB3-10369 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2e445192ae..e01bbe36d1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4015,7 +4015,7 @@ function phpbb_filter_root_path($errfile) $root_path = phpbb_realpath(dirname(__FILE__) . '/../'); } - return str_replace(array($root_path, '\\'), array('', '/'), $errfile); + return str_replace(array($root_path, '\\'), array('[ROOT]', '/'), $errfile); } /** -- cgit v1.2.1 From 9c0f75fd65e51212f5ef61e901420ea2f14a7a38 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 16:57:09 +0200 Subject: [ticket/10370] Use phpbb_filter_root_path() in get_backtrace(). PHPBB3-10370 --- phpBB/includes/functions.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e01bbe36d1..c2c8e489df 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3391,11 +3391,8 @@ function add_log() */ function get_backtrace() { - global $phpbb_root_path; - $output = '
'; $backtrace = debug_backtrace(); - $path = phpbb_realpath($phpbb_root_path); foreach ($backtrace as $number => $trace) { @@ -3406,15 +3403,7 @@ function get_backtrace() } // Strip the current directory from path - if (empty($trace['file'])) - { - $trace['file'] = ''; - } - else - { - $trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']); - $trace['file'] = substr($trace['file'], 1); - } + $trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']); $args = array(); // If include/require/include_once is not called, do not show arguments - they may contain sensible information @@ -3428,8 +3417,7 @@ function get_backtrace() if (!empty($trace['args'][0])) { $argument = htmlspecialchars($trace['args'][0]); - $argument = str_replace(array($path, '\\'), array('', '/'), $argument); - $argument = substr($argument, 1); + $argument = phpbb_filter_root_path($argument); $args[] = "'{$argument}'"; } } -- cgit v1.2.1 From 12530a763b436c3d01d2668999dc343a95926389 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 16:58:25 +0200 Subject: [ticket/10370] Use unset() on the first backtrace instead of checking in loop. PHPBB3-10370 --- phpBB/includes/functions.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c2c8e489df..b203dcbea3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3394,14 +3394,11 @@ function get_backtrace() $output = '
'; $backtrace = debug_backtrace(); - foreach ($backtrace as $number => $trace) - { - // We skip the first one, because it only shows this file/function - if ($number == 0) - { - continue; - } + // We skip the first one, because it only shows this file/function + unset($backtrace[0]); + foreach ($backtrace as $trace) + { // Strip the current directory from path $trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']); $args = array(); -- cgit v1.2.1 From 0df7e5eefa245559d3a1e1c0318fba0011513a9c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:07:06 +0200 Subject: [ticket/10370] Ease up code checking for arguments of include etc. PHPBB3-10370 --- phpBB/includes/functions.php | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b203dcbea3..5f90093bd0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3401,22 +3401,15 @@ function get_backtrace() { // Strip the current directory from path $trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']); - $args = array(); - // If include/require/include_once is not called, do not show arguments - they may contain sensible information - if (!in_array($trace['function'], array('include', 'require', 'include_once'))) - { - unset($trace['args']); - } - else + // Only show function arguments for include etc. + // Other parameters may contain sensible information + $args = array(); + if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once'))) { - // Path... - if (!empty($trace['args'][0])) - { - $argument = htmlspecialchars($trace['args'][0]); - $argument = phpbb_filter_root_path($argument); - $args[] = "'{$argument}'"; - } + $argument = htmlspecialchars($trace['args'][0]); + $argument = phpbb_filter_root_path($argument); + $args[] = "'{$argument}'"; } $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class']; -- cgit v1.2.1 From 7965387201c86a7d56ae8974ca1eaaba68d4e30d Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:15:31 +0200 Subject: [ticket/10370] Use single string instead of an array for arguments. PHPBB3-10370 --- phpBB/includes/functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5f90093bd0..df5a05f53b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3404,12 +3404,11 @@ function get_backtrace() // Only show function arguments for include etc. // Other parameters may contain sensible information - $args = array(); + $argument = ''; if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once'))) { $argument = htmlspecialchars($trace['args'][0]); $argument = phpbb_filter_root_path($argument); - $args[] = "'{$argument}'"; } $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class']; @@ -3419,7 +3418,8 @@ function get_backtrace() $output .= 'FILE: ' . htmlspecialchars($trace['file']) . '
'; $output .= 'LINE: ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '
'; - $output .= 'CALL: ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')
'; + $output .= 'CALL: ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']); + $output .= '(' . (($argument !== '') ? "'$argument'" : '') . ')
'; } $output .= '
'; return $output; -- cgit v1.2.1 From 8a84f42f7df73f579ad28272c116efc1de3b1651 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:15:58 +0200 Subject: [ticket/10370] Add require_once to whitelisted functions. PHPBB3-10370 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index df5a05f53b..105f2d5fa0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3405,7 +3405,7 @@ function get_backtrace() // Only show function arguments for include etc. // Other parameters may contain sensible information $argument = ''; - if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once'))) + if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once'))) { $argument = htmlspecialchars($trace['args'][0]); $argument = phpbb_filter_root_path($argument); -- cgit v1.2.1 From 19ce73c88496ca76342c2a07c1b01dc25392c6ff Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:20:11 +0200 Subject: [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path(). PHPBB3-10370 --- phpBB/includes/functions.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 105f2d5fa0..ef13b74f0c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3407,8 +3407,7 @@ function get_backtrace() $argument = ''; if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once'))) { - $argument = htmlspecialchars($trace['args'][0]); - $argument = phpbb_filter_root_path($argument); + $argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0])); } $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class']; -- cgit v1.2.1 From fc2af460ee2112ee5bcbd8076441ebcf8aea9513 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:33:18 +0200 Subject: [ticket/10370] Explain that we are not the ones hiding backtrace pieces. Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d. PHPBB3-10370 --- phpBB/includes/functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ef13b74f0c..d77517f2da 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3400,7 +3400,8 @@ function get_backtrace() foreach ($backtrace as $trace) { // Strip the current directory from path - $trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']); + $trace['file'] = (empty($trace['file'])) ? '(not given by php)' : htmlspecialchars(phpbb_filter_root_path($trace['file'])); + $trace['line'] = (empty($trace['line'])) ? '(not given by php)' : $trace['line']; // Only show function arguments for include etc. // Other parameters may contain sensible information @@ -3414,7 +3415,7 @@ function get_backtrace() $trace['type'] = (!isset($trace['type'])) ? '' : $trace['type']; $output .= '
'; - $output .= 'FILE: ' . htmlspecialchars($trace['file']) . '
'; + $output .= 'FILE: ' . $trace['file'] . '
'; $output .= 'LINE: ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '
'; $output .= 'CALL: ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']); -- cgit v1.2.1 From 79ad3a3f326f760fb2930b16533c46efc872dae2 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 19 Sep 2011 17:45:32 +0200 Subject: [ticket/10370] Add function documentation for get_stacktrace(). PHPBB3-10370 --- phpBB/includes/functions.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d77517f2da..c2b099d48a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3387,7 +3387,12 @@ function add_log() } /** -* Return a nicely formatted backtrace (parts from the php manual by diz at ysagoon dot com) +* Return a nicely formatted backtrace. +* +* Turns the array returned by debug_backtrace() into HTML markup. +* Also filters out absolute paths to phpBB root. +* +* @return string HTML markup */ function get_backtrace() { -- cgit v1.2.1 From e38fd2b9f29b0a39e1a05139c293ce7a20447734 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Tue, 20 Sep 2011 22:56:53 +0300 Subject: [ticket/10371] Removing last mentions of imageset Removing last mentions of imageset PHPBB3-10371 --- phpBB/includes/functions.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ab933eb523..2fa0f89436 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4559,8 +4559,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template', 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template', - 'T_IMAGESET_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset', - 'T_IMAGESET_LANG_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->lang_name, 'T_IMAGES_PATH' => "{$web_path}images/", 'T_SMILIES_PATH' => "{$web_path}{$config['smilies_path']}/", 'T_AVATAR_PATH' => "{$web_path}{$config['avatar_path']}/", @@ -4573,10 +4571,9 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_STYLESHEET_NAME' => $user->theme['theme_name'], 'T_THEME_NAME' => $user->theme['theme_path'], + 'T_THEME_LANG_NAME' => $user->data['user_lang'], 'T_TEMPLATE_NAME' => $user->theme['template_path'], 'T_SUPER_TEMPLATE_NAME' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? $user->theme['template_inherit_path'] : $user->theme['template_path'], - 'T_IMAGESET_NAME' => $user->theme['imageset_path'], - 'T_IMAGESET_LANG_NAME' => $user->data['user_lang'], 'T_IMAGES' => 'images', 'T_SMILIES' => $config['smilies_path'], 'T_AVATAR' => $config['avatar_path'], -- cgit v1.2.1 From 934a9da313fd6af6986b5320314a2859a1526a1b Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 20 Sep 2011 20:00:21 +0100 Subject: [feature/remove-db-styles] Remove style.php DB storage. Removed all use of the DB for serving/caching the theme from style.php, acp_style no longer stores the theme modified time either. As a consequence currently all stylesheets will be served through style.php (with no caching) until imagesets are removed [PHPBB3-10336], then they can we served as static files by HTTPd. PHPBB3-9741 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2fa0f89436..23f3e88be4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4566,7 +4566,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->lang_name), + 'T_STYLESHEET_LINK' => append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&lang=' . $user->lang_name), 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/' . $user->lang_name . '/stylesheet.css', 'T_STYLESHEET_NAME' => $user->theme['theme_name'], -- cgit v1.2.1 From c184fb86c9c6fb6a9dfdb731e785a145069a33ab Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 20 Sep 2011 23:12:07 +0100 Subject: [feature/remove-db-styles] Removed style.php! Finally sanity has arrived! No more delivering CSS through PHP. Better 3 years late than never. PHPBB3-9741 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 23f3e88be4..5ccb9edd07 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4566,7 +4566,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' => append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&lang=' . $user->lang_name), + 'T_STYLESHEET_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css', 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/' . $user->lang_name . '/stylesheet.css', 'T_STYLESHEET_NAME' => $user->theme['theme_name'], -- cgit v1.2.1