From: Julius Härtl <jus@bitgrid.net>
Date: Fri, 11 Dec 2020 07:11:54 +0000 (+0100)
Subject: Resolve conflict in addShare parameters
X-Git-Tag: v20.0.4~2^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e155943a3b623f0f331485e1646d074876b1470f;p=nextcloud-server.git

Resolve conflict in addShare parameters

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

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);