From 7b04a78f2d4b4af35f77e0591819d42c25532428 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Fri, 21 Jul 2017 13:42:13 +0300
Subject: [PATCH] clean up

---
 installation/model/configuration.php | 6 +++---
 installation/model/setup.php         | 2 +-
 installation/template/js/setup.js    | 1 +
 installation/view/remove/html.php    | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/installation/model/configuration.php b/installation/model/configuration.php
index 516a40f8eea68..eac341e86c49d 100644
--- a/installation/model/configuration.php
+++ b/installation/model/configuration.php
@@ -45,7 +45,7 @@ public function setup($options)
 		// Create Db
 		if (!$databaseModel->createDatabase($options))
 		{
-			$this->deleteConfiguartion();
+//			$this->deleteConfiguartion();
 			return false;
 		}
 
@@ -55,14 +55,14 @@ public function setup($options)
 		// Create tables
 		if (!$databaseModel->createTables($options))
 		{
-			$this->deleteConfiguartion();
+//			$this->deleteConfiguartion();
 			return false;
 		}
 
 		// Attempt to create the root user.
 		if (!$this->createRootUser($options))
 		{
-			$this->deleteConfiguartion();
+//			$this->deleteConfiguartion();
 			return false;
 		}
 
diff --git a/installation/model/setup.php b/installation/model/setup.php
index 9536999cfde72..9b435b68345aa 100644
--- a/installation/model/setup.php
+++ b/installation/model/setup.php
@@ -391,7 +391,7 @@ public function initialise($options)
 				$options->db_pass,
 				$options->db_name,
 				$options->db_prefix,
-				isset($options->db_select) ? $options->db_select : false
+				$options->db_select
 			);
 		}
 		catch (RuntimeException $e)
diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
index 53d1ec3107cce..f92842b5d9277 100644
--- a/installation/template/js/setup.js
+++ b/installation/template/js/setup.js
@@ -191,6 +191,7 @@ Joomla.installation = function(_container, _base) {
 					    alert('good to go')
 					    // You shall pass
 					    install(['Config']);
+					    install(['Config']);
 
 					    // If all good (we need some code here)
 					    goToPage('remove');
diff --git a/installation/view/remove/html.php b/installation/view/remove/html.php
index 8d90923d06a5e..436052216334f 100644
--- a/installation/view/remove/html.php
+++ b/installation/view/remove/html.php
@@ -23,12 +23,12 @@ public function render()
 		// Sample data
 
 		// Available languages
-		$langModel         = new InstallationModelLanguages();
-		$this->items       = $langModel->getItems();
 		$version           = new Jversion();
 		$altModel          = new InstallationModelChecks;
+		$langModel         = new InstallationModelLanguages();
+
+		$this->items       = $langModel->getItems();
 		$this->development = $version->isInDevelopmentState();
-		$this->options     = $altModel->getOptions();
 		$this->phpoptions  = $altModel->getPhpOptions();
 		$this->phpsettings = $altModel->getPhpSettings();