From 3185acb7b190c923f4aaa1f903fcaa2b970b40f1 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 15 Mar 2018 16:55:19 -0600 Subject: [PATCH] Add merge into the list to get /apps working again --- api/src/Vfs/Sharing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Vfs/Sharing.php b/api/src/Vfs/Sharing.php index 77ff240de3..c50a440015 100644 --- a/api/src/Vfs/Sharing.php +++ b/api/src/Vfs/Sharing.php @@ -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); }