mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:04 +01:00
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.
This commit is contained in:
parent
da87dd1931
commit
fd3466e33a
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user