mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
"- symlinkCache_resolve failed on other mounted dir (eg. from the filesystem stream-wrapper), as it removed the scheme
--> now done only for vfs scheme - quitened readlink to not complain if backend does not support links"
This commit is contained in:
parent
1dbec93dc9
commit
637b6557fb
@ -560,7 +560,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
|
||||
*/
|
||||
static function readlink($path)
|
||||
{
|
||||
return self::_call_on_backend('readlink',array($path));
|
||||
return self::_call_on_backend('readlink',array($path),true); // true = fail silent, if backend does not support readlink
|
||||
}
|
||||
|
||||
/**
|
||||
@ -858,7 +858,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
|
||||
*/
|
||||
static protected function symlinkCache_resolve($path,$do_symlink=true)
|
||||
{
|
||||
if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
|
||||
// remove vfs scheme, but no other schemes (eg. filesystem!)
|
||||
if ($path[0] != '/' && parse_url($path,PHP_URL_SCHEME) == self::SCHEME)
|
||||
{
|
||||
$path = parse_url($path,PHP_URL_PATH);
|
||||
}
|
||||
$strlen_path = strlen($path);
|
||||
|
||||
foreach(self::$symlink_cache as $p => $t)
|
||||
|
Loading…
Reference in New Issue
Block a user