Merge pull request #3025 An error occurred from owncloud/move-file

Cache: only look for child entires when doing a move operation when moving a folder

lib/files/cache/cache.php

@@ -318,9 +318,11 @@ class Cache {
 	 * @param string $target
 	 */
 	public function move($source, $target) {
-		$sourceId = $this->getId($source);
+		$sourceData = $this->get($source);
+		$sourceId = $sourceData['fileid'];
 		$newParentId = $this->getParentId($target);
 
+		if ($sourceData['mimetype'] === 'httpd/unix-directory') {
 			//find all child entries
 			$query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?');
 			$result = $query->execute(array($source . '/%'));
@@ -332,6 +334,7 @@ class Cache {
 				$targetPath = $target . substr($child['path'], $sourceLength);
 				$query->execute(array($targetPath, md5($targetPath), $child['fileid']));
 			}
+		}
 
 		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =?'
 			. ' WHERE `fileid` = ?');

tests/lib/files/cache/cache.php

@@ -162,10 +162,11 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$file4 = 'folder/foo/1';
 		$file5 = 'folder/foo/2';
 		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/bar');
+		$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
 
-		$this->cache->put($file1, $data);
+		$this->cache->put($file1, $folderData);
-		$this->cache->put($file2, $data);
+		$this->cache->put($file2, $folderData);
-		$this->cache->put($file3, $data);
+		$this->cache->put($file3, $folderData);
 		$this->cache->put($file4, $data);
 		$this->cache->put($file5, $data);