wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15799 from nextcloud/backport/15776/stable16

Browse source 
[stable16] search files by id in shared storages last
This commit is contained in:
Morris Jobke 2019-05-31 13:29:38 +02:00 committed by GitHub
commit 62e2ce05de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Files/View.php
View file

@ -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