diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 20:21:51 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 20:21:51 +0200 |
commit | bed27b603de1b5eb736d123fd58b774c7f79a4fd (patch) | |
tree | e73b8fd5f69821561f5b0be5727e38d5700b7966 /lib/setup/mysql.php | |
parent | 2cf26ee0b16bebe83a08e4be89681f73208ba9ae (diff) | |
parent | b58a464b864e70076aa0bde6d70c727b2aa32397 (diff) | |
download | nextcloud-server-bed27b603de1b5eb736d123fd58b774c7f79a4fd.tar.gz nextcloud-server-bed27b603de1b5eb736d123fd58b774c7f79a4fd.zip |
Merge branch 'master' into channels
Conflicts:
lib/util.php
Diffstat (limited to 'lib/setup/mysql.php')
-rw-r--r-- | lib/setup/mysql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php index 0cf04fde5a1..d97b6d2602f 100644 --- a/lib/setup/mysql.php +++ b/lib/setup/mysql.php @@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase { $this->dbuser=substr('oc_'.$username, 0, 16); if($this->dbuser!=$oldUser) { //hash the password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); |