From 506213899be121dda3c2c40766ee4a6ff5e7149c Mon Sep 17 00:00:00 2001
From: David Alexander <david@spiritlevel.nz>
Date: Wed, 2 Nov 2016 18:07:18 +1300
Subject: [PATCH] Setting default db adapter in installation  as PDO MySQL with
 MySQLi as fail safe.

Added back missed assignment of $_REQUEST['db']['type']
---
 _register_database.php           | 35 ++++++++++++++++----------------
 src/Dev/Install/config-form.html | 11 +++++++---
 src/Dev/Install/install.php5     | 22 +++++++++++++++++---
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/_register_database.php b/_register_database.php
index 903e3a0e5..c7549a887 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -1,26 +1,11 @@
 <?php
 
-// Register the SilverStripe provided databases
+// Register database adapters available in SilverStripe
 use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
 use SilverStripe\Dev\Install\MySQLDatabaseConfigurationHelper;
 
-// Use MySQLi as default
-DatabaseAdapterRegistry::register(
-	array(
-		/** @skipUpgrade */
-		'class' => 'MySQLDatabase',
-		'module' => 'framework',
-		'title' => 'MySQL 5.0+ (using MySQLi)',
-		'helperPath' => __DIR__ . '/src/Dev/Install/MySQLDatabaseConfigurationHelper.php',
-		'helperClass' => MySQLDatabaseConfigurationHelper::class,
-		'supported' => class_exists('MySQLi'),
-		'missingExtensionText' =>
-			'The <a href="http://www.php.net/manual/en/book.mysqli.php">MySQLi</a>
-			PHP extension is not available. Please install or enable it and refresh this page.'
-	)
-);
 
-// Setup MySQL PDO as alternate option
+// Register MySQL PDO as a database adapter (listed as first option in Dev/Install/config-form.html)
 DatabaseAdapterRegistry::register(
 	array(
 		/** @skipUpgrade */
@@ -36,3 +21,19 @@ DatabaseAdapterRegistry::register(
 			are unavailable. Please install or enable these and refresh this page.'
 	)
 );
+
+// Register MySQLi as a database adapter (listed as second option in Dev/Install/config-form.html)
+DatabaseAdapterRegistry::register(
+    array(
+        /** @skipUpgrade */
+        'class' => 'MySQLDatabase',
+        'module' => 'framework',
+        'title' => 'MySQL 5.0+ (using MySQLi)',
+        'helperPath' => __DIR__ . '/src/Dev/Install/MySQLDatabaseConfigurationHelper.php',
+        'helperClass' => MySQLDatabaseConfigurationHelper::class,
+        'supported' => class_exists('MySQLi'),
+        'missingExtensionText' =>
+            'The <a href="http://www.php.net/manual/en/book.mysqli.php">MySQLi</a>
+			PHP extension is not available. Please install or enable it and refresh this page.'
+    )
+);
diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html
index 42ead62dd..dbf514c25 100644
--- a/src/Dev/Install/config-form.html
+++ b/src/Dev/Install/config-form.html
@@ -183,14 +183,15 @@
 
 									</div>
 
-									<div class="action">
-										<input type="submit" class="action" value="Re-check requirements">
-									</div>
 								</div>
 							</div>
 
 							<div class="clear"><!-- --></div>
 
+							<div class="action">
+								<input type="submit" class="action" value="Re-check requirements">
+							</div>
+
 							<h3 class="sectionHeading">CMS Admin Account <small>Step 3 of 5</small></h3>
 
 							<div id="AdminAccount" class="section">
@@ -240,6 +241,10 @@
 								</div>
 							</div>
 
+							<div class="action">
+								<input type="submit" class="action" value="Re-check requirements">
+							</div>
+
 							<h3 class="sectionHeading">Theme selection <small>Step 4 of 5</small></h3>
 							<p class="helpText">You can change the theme or <a href="http://addons.silverstripe.org/add-ons?type=theme">download</a> another from the SilverStripe website after installation.</p>
 							<ul id="Themes">
diff --git a/src/Dev/Install/install.php5 b/src/Dev/Install/install.php5
index da907faec..e4d571c2e 100755
--- a/src/Dev/Install/install.php5
+++ b/src/Dev/Install/install.php5
@@ -142,8 +142,16 @@ if(isset($_REQUEST['db'])) {
 	if(isset($_REQUEST['db']['type'])) {
 		$type = $_REQUEST['db']['type'];
 	} else {
-		$type = $_REQUEST['db']['type'] = defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase';
-	}
+        if( defined('SS_DATABASE_CLASS') ){
+            $type = $_REQUEST['db']['type'] = SS_DATABASE_CLASS;
+        } elseif( $databaseClasses['MySQLPDODatabase']['supported'] ) {
+            $type = $_REQUEST['db']['type'] = 'MySQLPDODatabase';
+        } elseif( $databaseClasses['MySQLDatabase']['supported'] ) {
+            $type = $_REQUEST['db']['type'] = 'MySQLDatabase';
+        } else {
+            // handle error
+        }
+    }
 
 	// Disabled inputs don't submit anything - we need to use the environment (except the database name)
 	if($usingEnv) {
@@ -161,7 +169,15 @@ if(isset($_REQUEST['db'])) {
 		$databaseConfig['type'] = $type;
 	}
 } else {
-	$type = $_REQUEST['db']['type'] = defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase';
+    if( defined('SS_DATABASE_CLASS') ){
+        $type = $_REQUEST['db']['type'] = SS_DATABASE_CLASS;
+    } elseif( $databaseClasses['MySQLPDODatabase']['supported'] ) {
+        $type = $_REQUEST['db']['type'] = 'MySQLPDODatabase';
+    } elseif( $databaseClasses['MySQLDatabase']['supported'] ) {
+        $type = $_REQUEST['db']['type'] = 'MySQLDatabase';
+    } else {
+        // handle error
+    }
 	$_REQUEST['db'][$type] = $databaseConfig = array(
 		"type" => $type,
 		"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost",