holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
nathangray 2021-07-01 10:03:54 -06:00
parent da87dd1931
commit fd3466e33a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Vfs/Base.php
View File

@ -314,7 +314,7 @@ class Base
if($is_link && $do_symlink) if($is_link && $do_symlink)
{ {
$old_url = $url; $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'] ? $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; 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; $is_link = $old_url == $url;