diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-09 16:54:19 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-09 16:54:19 +0200 |
| commit | 1a8aae7282ca5ecdd7c2e2f54f5c2a99ec23eda4 (patch) | |
| tree | 863ca9578d1b755ae21b505db9521cdf38349331 /lib | |
| parent | cb18bdd7714efb610e8765214cd51bb2627e5258 (diff) | |
| parent | 1fb44bc7a7a8cde197fa8a4fee7fe2f49e69562e (diff) | |
| download | nextcloud-server-1a8aae7282ca5ecdd7c2e2f54f5c2a99ec23eda4.tar.gz nextcloud-server-1a8aae7282ca5ecdd7c2e2f54f5c2a99ec23eda4.zip | |
Merge pull request #16660 from owncloud/stable8-returnfileidbug
[stable8] Properly return fileid when scanFile() did not find differences
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 4778a6803ba..166c4e89b0a 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -155,6 +155,8 @@ class Scanner extends BasicEmitter { $data['fileid'] = $this->addToCache($file, $newData); $this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId)); \OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId)); + } else if (!empty($cacheData)) { + $data['fileid'] = $cacheData['fileid']; } } else { $this->removeFromCache($file); |