summaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-10-28 19:50:26 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-10-28 19:50:26 -0400
commit5aec26a37c1661ac9782b7ab48fa0f11f560d1ef (patch)
tree9e94f66eb356b8205a2f984ebcba08c4b5a9d4c5 /lib/setup.php
parenta6e18e0b6d329b4dfe9b71c244c0a45ac073f8b8 (diff)
downloadnextcloud-server-5aec26a37c1661ac9782b7ab48fa0f11f560d1ef.tar.gz
nextcloud-server-5aec26a37c1661ac9782b7ab48fa0f11f560d1ef.zip
Fix MySQL install, bug fix for issue 132
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/setup.php b/lib/setup.php
index 56f66945c2b..4e4a32e7362 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -202,7 +202,7 @@ class OC_Setup {
return $error;
}
- private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbtableprefix, $username) {
+ private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
//check if the database user has admin right
$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
if(!$connection) {
@@ -218,7 +218,7 @@ class OC_Setup {
$dbusername=substr('oc_'.$username, 0, 16);
if($dbusername!=$oldUser) {
//hash the password so we don't need to store the admin config in the config file
- $dbpassword=md5(time().$password);
+ $dbpassword=md5(time().$dbpass);
self::createDBUser($dbusername, $dbpassword, $connection);