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/public/share.php | |
| 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/public/share.php')
| -rw-r--r-- | lib/public/share.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 4461a1d421f..3e91f19e221 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -513,7 +513,7 @@ class Share { if (isset($oldToken)) { $token = $oldToken; } else { - $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH); + $token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH); } $result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token); |