dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix so maradb 10.1 install can create the database.

This commit is contained in:
Harry G. Coin 2016-04-25 21:34:44 -05:00
parent f02028629a
commit b9285e81fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/install/resources/classes/global_settings.php
View File

@ -161,7 +161,7 @@ require_once "root.php";
$this->_domain_count = count($_SESSION["domains"]); $this->_domain_count = count($_SESSION["domains"]);
// collect db_info // collect db_info
global $db_type, $db_path, $db_host, $db_port, $db_name, $db_username, $db_password; global $db_type, $db_path, $db_host, $db_port, $db_name, $db_username, $db_password, $db_create;
$this->_db_type = $db_type; $this->_db_type = $db_type;
$this->_db_path = $db_path; $this->_db_path = $db_path;
$this->_db_host = $db_host; $this->_db_host = $db_host;
@ -194,10 +194,9 @@ require_once "root.php";
$this->$o_key = $value; $this->$o_key = $value;
} }
} }
if($this->_db_create and strlen($this->_db_create_username) == 0) if($this->_db_create== 1) {
{ if (strlen($this->_db_create_username)==0) $this->_db_create_username='root';
$this->_db_create_username = $this->_db_username; if (strlen($this->_db_create_password)==0) $this->_db_password;
$this->_db_create_password = $this->_db_password;
} }
if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; } if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; }

1
core/install/resources/page_parts/install_config_database.php
View File

@ -80,6 +80,7 @@
//set defaults //set defaults
if (strlen($db_host) == 0) { $db_host = 'localhost'; } if (strlen($db_host) == 0) { $db_host = 'localhost'; }
if (strlen($db_port) == 0) { $db_port = '3306'; } if (strlen($db_port) == 0) { $db_port = '3306'; }
if (is_null($db_create)) { $db_create = '0'; }
//if (strlen($db_name) == 0) { $db_name = 'fusionpbx'; } //if (strlen($db_name) == 0) { $db_name = 'fusionpbx'; }
echo "<tr>\n"; echo "<tr>\n";