From 5aec26a37c1661ac9782b7ab48fa0f11f560d1ef Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 28 Oct 2012 19:50:26 -0400
Subject: [PATCH] Fix MySQL install, bug fix for issue 132
---
lib/setup.php | 4 ++--
1 file 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);
--
GitLab