From 153cd802a9bbc0f5a5f67fe428af7ca78185011f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 22 Sep 2012 14:40:04 +0200
Subject: [PATCH] add partial file data to the result of Cache::get

---
 lib/files/cache/cache.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 8fc575948dc..9d90ab041f6 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -31,7 +31,13 @@ class Cache {
 		$query = \OC_DB::prepare(
 			'SELECT `id`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`
 			 FROM `*PREFIX*filecache` ' . $where);
-		$result=$query->execute($params);
+		$result = $query->execute($params);
+
+		//merge partial data
+		$key = $file->getStorageId() . '::' . $file->getInternalPath();
+		if (isset(self::$partial[$key])) {
+			$result=array_merge($result, self::$partial[$key]);
+		}
 		return $result->fetchRow();
 	}