fix cacheentry return wrong storage id

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 3a3f51488e6..859d79f88d4 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -163,6 +163,7 @@ class Cache implements ICache {
 		$data['storage_mtime'] = (int)$data['storage_mtime'];
 		$data['encryptedVersion'] = (int)$data['encrypted'];
 		$data['encrypted'] = (bool)$data['encrypted'];
+		$data['storage_id'] = $data['storage'];
 		$data['storage'] = $storageId;
 		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
 		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
diff --git a/lib/private/Files/Cache/CacheEntry.php b/lib/private/Files/Cache/CacheEntry.php
index 4a2579a88f8..784bd3a6f98 100644
--- a/lib/private/Files/Cache/CacheEntry.php
+++ b/lib/private/Files/Cache/CacheEntry.php
@@ -62,7 +62,7 @@ class CacheEntry implements ICacheEntry, \ArrayAccess {
 	}
 
 	public function getStorageId() {
-		return $this->data['storage'];
+		return $this->data['storage_id'];
 	}