From 1dfd44ecff1b9ecfd96002e6e125f9309fa6156d Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 24 Jan 2013 06:03:32 +0000
Subject: [PATCH] if mysqli disabled, use mysql default set

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12583 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/install.view.php   | 15 +++++++++++++++
 modules/install/tpl/select_db.html |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 1fdcaa2bf..a111529cd 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -84,6 +84,21 @@ class installView extends install
 		}
 		else
 		{
+			$defaultDatabase = 'mysqli';
+			$disableList = DB::getDisableList();
+			if(is_array($disableList))
+			{
+				foreach($disableList AS $key=>$value)
+				{
+					if($value->db_type == $defaultDatabase)
+					{
+						$defaultDatabase = 'mysql';
+						break;
+					}
+				}
+			}
+			Context::set('defaultDatabase', $defaultDatabase);
+
 			Context::set('progressMenu', '4');
 			$this->setTemplateFile('select_db');
 		}
diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html
index ef55dc6c8..ee097523a 100644
--- a/modules/install/tpl/select_db.html
+++ b/modules/install/tpl/select_db.html
@@ -7,11 +7,11 @@
 				<input type="hidden" name="module" value="{$module}" />
 				<input type="hidden" name="act" value="dispInstallDBForm" />
 				<div class="x_control-group" loop="DB::getEnableList() => $key,$val">
-					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" checked="checked"|cond="$val->db_type=='mysqli'" /> {$val->db_type}</label>
+					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" checked="checked"|cond="$val->db_type==$defaultDatabase" /> {$val->db_type}</label>
 					<p>{$lang->db_desc[$val->db_type]}</p>
 				</div>
 				<div class="x_control-group x_muted" loop="DB::getDisableList() => $key,$val">
-					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" checked="checked"|cond="$val->db_type=='mysqli'" /> {$val->db_type}<em>({$lang->can_use_when_installed})</em></label>
+					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" /> {$val->db_type}<em>({$lang->can_use_when_installed})</em></label>
 					<p>{$lang->db_desc[$val->db_type]}</p>
 				</div>
 				<div class="ibtnArea">