mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

[ticket/17100] Refactor code to be more reusable

Browse Source 
PHPBB3-17100
This commit is contained in:
Marc Alexander
2022-04-18 20:10:02 +02:00
parent 516d5313ad
commit 2dfe5ebe6d
16 changed files with 189 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions.php
View File

@@ -270,7 +270,7 @@ function phpbb_version_compare(string $version1, string $version2, string $opera
* @param string $default Language ISO code to be selected by default in the dropdown list
* @param array $langdata Language data in format of array(array('lang_iso' => string, lang_local_name => string), ...)
*/
function phpbb_language_select(\phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, string $default = '', array $langdata = []): void
function phpbb_language_select(\phpbb\db\driver\driver_interface $db, string $default = '', array $langdata = []): array
{
if (empty($langdata))
{
@@ -282,14 +282,17 @@ function phpbb_language_select(\phpbb\db\driver\driver_interface $db, \phpbb\tem
$db->sql_freeresult($result);
}
$lang_options = [];
foreach ($langdata as $row)
{
$template->assign_block_vars('lang_options', [
'SELECTED' => $row['lang_iso'] == $default,
'LANG_ISO' => $row['lang_iso'],
'LANG_LOCAL_NAME' => $row['lang_local_name']
]);
$lang_options[] = [
'value' => $row['lang_iso'],
'label' => $row['lang_local_name'],
'selected' => $row['lang_iso'] === $default,
];
}
return $lang_options;
}
/**