aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/include/functions_install.inc.php7
-rw-r--r--admin/themes/default/template/install.tpl4
2 files changed, 3 insertions, 8 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
index bb9acb5b3..48699cd29 100644
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -89,7 +89,7 @@ function available_engines()
if (file_exists(sprintf($pattern, $engine_name)))
{
$engines[$engine_name]['label'] = $engine['engine'];
- $engines[$engine_name]['available'] = 'disabled';
+ $engines[$engine_name]['available'] = false;
if (isset($engine['function_available'])
&& function_exists($engine['function_available']))
@@ -104,11 +104,6 @@ function available_engines()
}
}
- if (count($engines)>1)
- {
- $engines[$GLOBALS['conf']['dbengine_select_default']]['selected'] = true;
- }
-
if ($engines['sqlite']['available'] && $engines['pdo-sqlite']['available'])
{
if ($GLOBALS['conf']['db_sqlite_default']=='native')
diff --git a/admin/themes/default/template/install.tpl b/admin/themes/default/template/install.tpl
index e7981add2..7e27e6184 100644
--- a/admin/themes/default/template/install.tpl
+++ b/admin/themes/default/template/install.tpl
@@ -112,8 +112,8 @@ TD {
<select name="dblayer" id="dblayer">
{foreach from=$F_DB_ENGINES key=k item=v}
<option value="{$k}"
- {if $k==$F_DB_LAYER or $v.selected} selected="selected"{/if}
- {if $v.available!=1} disabled="disabled"{/if}
+ {if $k==$F_DB_LAYER and $v.available} selected="selected"{/if}
+ {if !$v.available} disabled="disabled"{/if}
>{$v.label}</option>
{/foreach}
</select>