From 08800b83c95f2cea4cee42098ed20d37173b96e5 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 14 May 2021 09:43:30 -0600 Subject: [PATCH] Fix symlinks were opened read-only in Collabora --- api/src/Vfs/Base.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Vfs/Base.php b/api/src/Vfs/Base.php index ee16ab2922..51696f8fb4 100644 --- a/api/src/Vfs/Base.php +++ b/api/src/Vfs/Base.php @@ -315,7 +315,8 @@ class Base { $old_url = $url; $_url = self::symlinkCache_resolve(Vfs::parse_url($url,PHP_URL_PATH)); - $url = @readlink($url) ?: ($_url != $parts['path'] ? str_replace($parts['path'],$_url,$url) : null) ?:$url; + $url = @readlink($url) ?: ($_url != $parts['path'] ? + str_replace([$parts['path'],Vfs::parse_url($old_url,PHP_URL_SCHEME)],[$_url,Vfs::parse_url(Vfs::resolve_url($_url),PHP_URL_SCHEME)],$url) : null) ?:$url; $is_link = $old_url == $url; } if ($replace_user_pass_host && !$is_link)