From a75d89ef73a5554a6a079be5721a926173ca05df Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <alexeymelnichuck@gmail.com>
Date: Thu, 18 May 2017 17:43:43 +0300
Subject: [PATCH] Fix. Load `Message` class (#2585)

Fix. Use correct way to get text message.
Fix. Use `Database Username` to create database if no `Create Database Username` specified.
---
 core/install/install.php                           | 3 ++-
 core/install/resources/classes/global_settings.php | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/install/install.php b/core/install/install.php
index 1dcce03c6f..629198fc88 100644
--- a/core/install/install.php
+++ b/core/install/install.php
@@ -28,6 +28,7 @@
 	require_once "root.php";
 	require_once "resources/functions.php";
 	require_once "resources/classes/text.php";
+	require_once "resources/classes/messages.php";
 
 //start a php session
 	if (!isset($_SESSION)) { session_start(); }
@@ -257,7 +258,7 @@
 		include "resources/page_parts/install_config_database.php";
 	}
 	elseif($install_step == 'execute'){
-		echo "<p><b>".$text['header-installing'][$install_language]."</b></p>\n";
+		echo "<p><b>".$text['header-installing']."</b></p>\n";
 		//$protocol = 'http';
 		//if($_SERVER['HTTPS']) { $protocol = 'https'; }
 		//echo "<iframe src='$protocol://$domain_name/core/install/install_first_time.php' style='border:solid 1px #000;width:100%;height:auto'></iframe>";
diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php
index b86fad1a28..cf0aff5712 100644
--- a/core/install/resources/classes/global_settings.php
+++ b/core/install/resources/classes/global_settings.php
@@ -194,10 +194,6 @@ require_once "root.php";
 						$this->$o_key = $value;
 					}
 				}
-				if($this->_db_create== 1) {
-                                    if (strlen($this->_db_create_username)==0) $this->_db_create_username='root';
-                                    if (strlen($this->_db_create_password)==0) $this->_db_password;
-				}
 				if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; }
 
 				// domain info