summaryrefslogtreecommitdiffstats
path: root/lib/install.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-01-28 21:10:53 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-01-28 21:10:53 +0000
commit572f375eeea4f252d3a9e785be7b81ce6ee9cbb8 (patch)
tree607c4639ca27248015b5f1209e03bddfd032af97 /lib/install.php
parent76f176159ee546614e8078f46382771f9ea4b358 (diff)
downloadampache-572f375eeea4f252d3a9e785be7b81ce6ee9cbb8.tar.gz
ampache-572f375eeea4f252d3a9e785be7b81ce6ee9cbb8.tar.bz2
ampache-572f375eeea4f252d3a9e785be7b81ce6ee9cbb8.zip
Allow blank root MySQL password, required for compatibilty, continue to dis-allow Ampache MySQL account password to be blank. Revert additional check on DB Connection, do not want to tell the world their DB password is blank. The config clearly states this restriction
Diffstat (limited to 'lib/install.php')
-rw-r--r--lib/install.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/install.php b/lib/install.php
index 5f45ffc7..1d114915 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -119,12 +119,6 @@ function install_insert_db($username,$password,$hostname,$database) {
return false;
}
- // Check if the password has been set
- if (!$password) {
- Error::add('general','Error: MySQL administrative password is empty. That is not allowed!');
- return false;
- }
-
$data['database_username'] = $username;
$data['database_password'] = $password;
$data['database_hostname'] = $hostname;
@@ -180,7 +174,7 @@ function install_insert_db($username,$password,$hostname,$database) {
// Check if the password has been set
if (!$password) {
- Error::add('general','Error: Ampache database user password is empty. That is not allowed!');
+ Error::add('general','Error: Ampache SQL user must have a password');
return false;
}