diff options
author | Julius Härtl <jus@bitgrid.net> | 2020-12-11 10:11:54 +0300 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2020-12-14 13:11:00 +0300 |
commit | e155943a3b623f0f331485e1646d074876b1470f (patch) | |
tree | a286495abc937dd00bf6c4a642b28158a25de2f2 | |
parent | 0bbc0dde10934d6d2f2c3dd1be28c2b45cb0c6a3 (diff) |
Resolve conflict in addShare parameters
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r-- | apps/files_sharing/lib/External/Manager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index e59c98b07cd..e4b28804fcc 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -131,7 +131,7 @@ class Manager { * @return Mount|null * @throws \Doctrine\DBAL\DBALException */ - public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) { + public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted = false, $user = null, $remoteId = '', $parent = -1) { $user = $user ? $user : $this->uid; $accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING; $name = Filesystem::normalizePath('/' . $name); |