diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-03-09 10:36:45 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-03-09 16:01:53 +0100 |
| commit | 80b91264e16e6429aa7236d69f419a509dfb2cde (patch) | |
| tree | 475c90441f52509e833b7fc9df57bc7779fb9f91 /apps/files_sharing | |
| parent | 0cc53ee06dafbd3984bbf1d554585a5731b500a9 (diff) | |
| download | nextcloud-server-80b91264e16e6429aa7236d69f419a509dfb2cde.tar.gz nextcloud-server-80b91264e16e6429aa7236d69f419a509dfb2cde.zip | |
Delay check till scanner is used
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/external/scanner.php | 5 | ||||
| -rw-r--r-- | apps/files_sharing/lib/external/storage.php | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index bfb9e817f09..1cc6cf8f5f9 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -36,6 +36,10 @@ class Scanner extends \OC\Files\Cache\Scanner { /** {@inheritDoc} */ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) { + if(!$this->storage->remoteIsOwnCloud()) { + return parent::scan($path, $recursive, $recursive, $lock); + } + $this->scanAll(); } @@ -90,7 +94,6 @@ class Scanner extends \OC\Files\Cache\Scanner { } if ($data['status'] === 'success') { $this->addResult($data['data'], ''); - } elseif ($data['status'] === 'unsupported') { } else { throw new \Exception( 'Error while scanning remote share: "' . diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 16fd84bdba5..8fe7af66044 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -136,9 +136,6 @@ class Storage extends DAV implements ISharedStorage { if (!$storage) { $storage = $this; } - if(!$this->remoteIsOwnCloud()) { - return parent::getScanner($path, $storage); - } if (!isset($this->scanner)) { $this->scanner = new Scanner($storage); } @@ -266,7 +263,7 @@ class Storage extends DAV implements ISharedStorage { * * @return bool */ - private function remoteIsOwnCloud() { + public function remoteIsOwnCloud() { if(defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) { return false; } |