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 "
".$text['header-installing'][$install_language]."
\n"; + echo "".$text['header-installing']."
\n"; //$protocol = 'http'; //if($_SERVER['HTTPS']) { $protocol = 'https'; } //echo ""; 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