extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add merge into the list to get /apps working again

Browse Source
This commit is contained in:
nathangray 2018-03-15 16:55:19 -06:00
parent 6be5b8f678
commit 3185acb7b1
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/Sharing.php
View File

@ -573,7 +573,7 @@ class Sharing
} }
if (($exists = ($stat = Vfs::stat($path)) && Vfs::check_access($path, Vfs::READABLE, $stat))) 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); $vfs_path = Vfs::parse_url($path, PHP_URL_PATH);
} }