diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
commit | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (patch) | |
tree | 947d58076dae8d5c4d0bd001ccebbe079448e057 /lib/setup/postgresql.php | |
parent | 1558cb860c2fb26fdde14fce2a16acbb29d12b3e (diff) | |
parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
download | nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.tar.gz nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.zip |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
apps/files/index.php
Diffstat (limited to 'lib/setup/postgresql.php')
-rw-r--r-- | lib/setup/postgresql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php index 49fcbf0326e..89d328ada19 100644 --- a/lib/setup/postgresql.php +++ b/lib/setup/postgresql.php @@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase { //add prefix to the postgresql user name to prevent collisions $this->dbuser='oc_'.$username; //create a new 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); |