mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

[ticket/17191] Use di and avoid circular ref

Browse Source 
PHPBB3-17191
This commit is contained in:
Christian Schnegelberger
2023-09-23 11:52:53 +02:00
committed by Marc Alexander
parent 14b7caecd1
commit 8abf9b66e1
7 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions.php
View File

@@ -3829,10 +3829,10 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
$language_file_helper = $phpbb_container->get('language.helper.language_file');
// Grab the users lang direction and store it for later use
$direction = $language_file_helper->get_lang_key_value('direction');
$direction = $language_file_helper->get_lang_key_value('direction', $user->data['user_lang']);
// Get the user_lang string
$user_lang = $language_file_helper->get_lang_key_value('user_lang');
$user_lang = $language_file_helper->get_lang_key_value('user_lang', $user->data['user_lang']);
if (strpos($user_lang, '-x-') !== false)
{
$user_lang = substr($user_lang, 0, strpos($user_lang, '-x-'));
@@ -3938,7 +3938,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'L_INDEX' => ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'],
'L_SITE_HOME' => ($config['site_home_text'] !== '') ? $config['site_home_text'] : $user->lang['HOME'],
'L_ONLINE_EXPLAIN' => $l_online_time,
'L_RECAPTCHA_LANG' => $language_file_helper->get_lang_key_value('recaptcha_lang'),
'L_RECAPTCHA_LANG' => $language_file_helper->get_lang_key_value('recaptcha_lang', $user->data['user_lang']),
'U_PRIVATEMSGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),
'U_RETURN_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),