diff options
Diffstat (limited to 'lib/private/Files/View.php')
| -rw-r--r-- | lib/private/Files/View.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index fa531707648..fef6153fb9a 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -49,6 +49,7 @@ use Icewind\Streams\CallbackWrapper; use OC\Files\Mount\MoveableMount; use OC\Files\Storage\Storage; use OC\User\User; +use OCA\Files_Sharing\SharedMount; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; use OCP\Files\EmptyFileNameException; @@ -1718,6 +1719,13 @@ class View { // reverse the array so we start with the storage this view is in // which is the most likely to contain the file we're looking for $mounts = array_reverse($mounts); + + // put non shared mounts in front of the shared mount + // this prevent unneeded recursion into shares + usort($mounts, function(IMountPoint $a, IMountPoint $b) { + return $a instanceof SharedMount && (!$b instanceof SharedMount) ? 1 : -1; + }); + foreach ($mounts as $mount) { /** * @var \OC\Files\Mount\MountPoint $mount |