From 4606a2940872c2c68b138775b8e611f8ac6d3f26 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 1 Jul 2021 10:03:54 -0600 Subject: [PATCH] Api: Fix bug where StreamWrappers that mapped onto other StreamWrappers would be parsed earlier than we want, leading to the first StreamWrapper not getting used. --- api/src/Vfs/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Vfs/Base.php b/api/src/Vfs/Base.php index 6cf09a96f2..73191c236c 100644 --- a/api/src/Vfs/Base.php +++ b/api/src/Vfs/Base.php @@ -314,7 +314,7 @@ class Base if($is_link && $do_symlink) { $old_url = $url; - $_url = self::symlinkCache_resolve(Vfs::parse_url($url,PHP_URL_PATH)); + $_url = self::symlinkCache_resolve($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;