aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/docs/CHANGELOG.html2
-rw-r--r--phpBB/includes/functions_install.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4d676ad80b..1375bcfe4a 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -240,7 +240,7 @@ p a {
<li>[Feature] Added the option to disable the flash bbcode globally (DelvarWorld).</li>
<li>[Sec] Changed the embedding of Flash (NeoThermic, DelvarWorld).</li>
<li>[Fix] Use the signature setting for PMs (Bug #12001)</li>
-
+ <li>[Fix] Made the DBMS selection use language variables (Bug #11969)</li>
</ul>
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index fa85b89d48..bf82802a29 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -29,6 +29,7 @@ function can_load_dll($dll)
*/
function get_available_dbms($dbms = false, $return_unavailable = false, $only_20x_options = false)
{
+ global $lang;
$available_dbms = array(
'firebird' => array(
'LABEL' => 'FireBird',
@@ -172,12 +173,14 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
*/
function dbms_select($default = '', $only_20x_options = false)
{
+ global $lang;
+
$available_dbms = get_available_dbms(false, false, $only_20x_options);
$dbms_options = '';
foreach ($available_dbms as $dbms_name => $details)
{
$selected = ($dbms_name == $default) ? ' selected="selected"' : '';
- $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $details['LABEL'] . '</option>';
+ $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>';
}
return $dbms_options;
}