summaryrefslogtreecommitdiffstats
path: root/install.php
diff options
context:
space:
mode:
authorPaul Arthur <flowerysong00@yahoo.com>2012-11-08 14:02:28 -0500
committerPaul Arthur <flowerysong00@yahoo.com>2012-11-08 14:02:28 -0500
commitc51ddbd3d64e92209bf4fc214bf80d8cc33cc2af (patch)
tree7d42897f2567c5fa2b90a4d8cbe76148c6e7ccf6 /install.php
parent70b37ad4725c3ce3bae1790ceac6821d3c97af27 (diff)
downloadampache-c51ddbd3d64e92209bf4fc214bf80d8cc33cc2af.tar.gz
ampache-c51ddbd3d64e92209bf4fc214bf80d8cc33cc2af.tar.bz2
ampache-c51ddbd3d64e92209bf4fc214bf80d8cc33cc2af.zip
Clean up check_database, more direct mysql calls
Diffstat (limited to 'install.php')
-rw-r--r--install.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/install.php b/install.php
index 752166f5..00dd698b 100644
--- a/install.php
+++ b/install.php
@@ -86,8 +86,14 @@ switch ($_REQUEST['action']) {
$htmllang = $_REQUEST['htmllang'];
$charset = $_REQUEST['charset'];
// Test and make sure that the values they give us actually work
- if (!check_database($hostname,$username,$password)) {
- Error::add('config', T_('Error: Unable to make Database Connection') . Dba::error());
+ Config::set_by_array(array(
+ 'database_username' => $username,
+ 'database_password' => $password,
+ 'database_hostname' => $hostname
+ ), true
+ );
+ if (!check_database()) {
+ Error::add('config', T_('Error: Unable to make Database Connection: ') . Dba::error());
}
// Was download pressed?