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

as we now always set the default context / user, we have to use check_set_context($url, $always_set=true)

Browse Source
This commit is contained in:
Ralf Becker 2020-09-19 13:49:24 +02:00
parent 5ccb26d646
commit 20c5dde04c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Vfs/Sqlfs/StreamWrapper.php
View File

@ -1147,10 +1147,7 @@ class StreamWrapper extends Api\Db\Pdo implements Vfs\StreamWrapperIface
$path = Vfs::parse_url($url,PHP_URL_PATH); $path = Vfs::parse_url($url,PHP_URL_PATH);
if (!$this->context) $this->check_set_context($url, true);
{
$this->check_set_context($url);
}
// webdav adds a trailing slash to dirs, which causes url_stat to NOT find the file otherwise // webdav adds a trailing slash to dirs, which causes url_stat to NOT find the file otherwise
if ($path != '/' && substr($path,-1) == '/') if ($path != '/' && substr($path,-1) == '/')

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

@ -693,7 +693,7 @@ class StreamWrapper extends Base implements StreamWrapperIface
function url_stat ( $path, $flags, $try_create_home=false, $check_symlink_components=true, $check_symlink_depth=self::MAX_SYMLINK_DEPTH, $try_reconnect=true ) function url_stat ( $path, $flags, $try_create_home=false, $check_symlink_components=true, $check_symlink_depth=self::MAX_SYMLINK_DEPTH, $try_reconnect=true )
{ {
// we have no context, but $path is a URL with a valid user --> set it // we have no context, but $path is a URL with a valid user --> set it
$this->check_set_context($path); $this->check_set_context($path, true);
if (!($url = static::resolve_url($path,!($flags & STREAM_URL_STAT_LINK), $check_symlink_components))) if (!($url = static::resolve_url($path,!($flags & STREAM_URL_STAT_LINK), $check_symlink_components)))
{ {