mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 23:58:54 +01:00
Add merge into the list to get /apps working again
This commit is contained in:
parent
6be5b8f678
commit
3185acb7b1
@ -573,7 +573,7 @@ class Sharing
|
||||
}
|
||||
if (($exists = ($stat = Vfs::stat($path)) && Vfs::check_access($path, Vfs::READABLE, $stat)))
|
||||
{
|
||||
if (!preg_match("/^(sqlfs|vfs|stylite\.versioning)/", $stat['url']))
|
||||
if (!preg_match("/^(sqlfs|vfs|stylite\.versioning|stylite\.merge)/", $stat['url']))
|
||||
{
|
||||
$vfs_path = Vfs::parse_url($path, PHP_URL_PATH);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user