diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-05 13:39:45 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-05 13:39:45 +0200 |
| commit | f8563ec5831713b341db1b2cd480328912818607 (patch) | |
| tree | 49c37ae10321b8490cb9d87104422f8a460c6301 /lib/setup | |
| parent | fd7469db9e1cd1fd85e3a8a18aac87c7040ec8e7 (diff) | |
| parent | 0527fb05ad4106db199bf3937b753563061c39bf (diff) | |
| download | nextcloud-server-f8563ec5831713b341db1b2cd480328912818607.tar.gz nextcloud-server-f8563ec5831713b341db1b2cd480328912818607.zip | |
Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update
Conflicts:
lib/util.php
Diffstat (limited to 'lib/setup')
| -rw-r--r-- | lib/setup/mysql.php | 2 | ||||
| -rw-r--r-- | lib/setup/oci.php | 2 | ||||
| -rw-r--r-- | lib/setup/postgresql.php | 2 |
3 files changed, 3 insertions, 3 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); diff --git a/lib/setup/oci.php b/lib/setup/oci.php index 86b53de45a4..326d7a00531 100644 --- a/lib/setup/oci.php +++ b/lib/setup/oci.php @@ -65,7 +65,7 @@ class OCI extends AbstractDatabase { //add prefix to the oracle 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); //oracle passwords are treated as identifiers: // must start with aphanumeric char 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); |