diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3ffd2ae234..850b3ef28d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3826,8 +3826,11 @@ function page_header($page_title = '', $display_online_list = false, $item_id = // Send a proper content-language to the output $language_file_helper = $phpbb_container->get('language.helper.language_file'); - $available_languages = $language_file_helper->get_available_languages(); - $user_lang = $available_languages[0]['user_lang']; + // Grab the users lang direction and store it for later use + $direction = $language_file_helper->get_lang_key_value('direction'); + + // Get the user_lang string + $user_lang = $language_file_helper->get_lang_key_value('user_lang'); if (strpos($user_lang, '-x-') !== false) { $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); @@ -3883,10 +3886,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $s_login_redirect = build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url()))); - // Grab the users lang direction and store it for later use - $available_languages = $language_file_helper->get_available_languages(); - $direction = $available_languages[0]['direction']; - // Add form token for login box, in case page is presenting a login form. add_form_key('login', '_LOGIN'); diff --git a/phpBB/phpbb/language/language_file_helper.php b/phpBB/phpbb/language/language_file_helper.php index b64269f27a..f862754ce4 100644 --- a/phpBB/phpbb/language/language_file_helper.php +++ b/phpBB/phpbb/language/language_file_helper.php @@ -67,6 +67,18 @@ class language_file_helper return $available_languages; } + /** + * Return by given lang key its composer.json value + * + * @return string + * + */ + public function get_lang_key_value($lang_key) : string + { + $available_languages = $this->get_available_languages(); + return $available_languages[0][$lang_key]; + } + /** * Collect some data from the composer.json file *