From ed32b4d8dc396a656a6a0b84f9a40c5fce53278a Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sat, 25 Mar 2006 19:53:53 +0000
Subject: [PATCH] A small change to the ordering to try and ensure that the
 mysql module with the most functionality is listed first so that people are
 not using the old mysql3 one if they don't check the list. This will probably
 get looked at again later

git-svn-id: file:///svn/phpbb/trunk@5726 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install_install.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index b09406ef2b..6a62c36518 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -60,6 +60,11 @@ class install_install extends module
 				$this->obtain_database_settings($mode, $sub);
 			
 			break;
+
+			case 'administrator' :
+				$this->obtain_admin_settings($mode, $sub);
+
+			break;
 		}
 
 		$this->tpl_name = 'install_install';
@@ -631,13 +636,6 @@ class install_install extends module
 			'DELIM'			=> ';;',
 			'COMMENTS'		=> 'remove_remarks'
 		),
-		'mysql'		=> array(
-			'LABEL'			=> 'MySQL',
-			'SCHEMA'		=> 'mysql',
-			'MODULE'		=> 'mysql', 
-			'DELIM'			=> ';',
-			'COMMENTS'		=> 'remove_remarks'
-		),
 		'mysqli'	=> array(
 			'LABEL'			=> 'MySQL 4.1.x/5.x (MySQLi)',
 			'SCHEMA'		=> 'mysql',
@@ -652,6 +650,13 @@ class install_install extends module
 			'DELIM'			=> ';',
 			'COMMENTS'		=> 'remove_remarks'
 		),
+		'mysql'		=> array(
+			'LABEL'			=> 'MySQL',
+			'SCHEMA'		=> 'mysql',
+			'MODULE'		=> 'mysql', 
+			'DELIM'			=> ';',
+			'COMMENTS'		=> 'remove_remarks'
+		),
 		'mssql'		=> array(
 			'LABEL'			=> 'MS SQL Server 7/2000',
 			'SCHEMA'		=> 'mssql',