Properly return fileid when scanFile() did not find differences

2 files changed, 10 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);
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index b44cf0a49df..c17413678ac 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -181,6 +181,14 @@ class Scanner extends \Test\TestCase {
 		$this->assertEquals($oldData['size'], $newData['size']);
 	}
 
+	public function testReuseIdentical() {
+		$this->storage->file_put_contents('file.txt', 'contents');
+		$data = $this->scanner->scanFile('file.txt', \OC\Files\Cache\Scanner::REUSE_ETAG);
+		$this->assertTrue(isset($data['fileid']));
+		$data = $this->scanner->scanFile('file.txt', \OC\Files\Cache\Scanner::REUSE_ETAG);
+		$this->assertTrue(isset($data['fileid']));
+	}
+
 	public function testRemovedFile() {
 		$this->fillTestFolders();