always use numeric storage id in cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
86473306f3
commit
14a561ddad
|
@ -142,7 +142,7 @@ class Cache implements ICache {
|
|||
}
|
||||
return $data;
|
||||
} else {
|
||||
return self::cacheEntryFromData($data, $this->storageId, $this->mimetypeLoader);
|
||||
return self::cacheEntryFromData($data, $this->mimetypeLoader);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -150,11 +150,10 @@ class Cache implements ICache {
|
|||
* Create a CacheEntry from database row
|
||||
*
|
||||
* @param array $data
|
||||
* @param string $storageId
|
||||
* @param IMimeTypeLoader $mimetypeLoader
|
||||
* @return CacheEntry
|
||||
*/
|
||||
public static function cacheEntryFromData($data, $storageId, IMimeTypeLoader $mimetypeLoader) {
|
||||
public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
|
||||
//fix types
|
||||
$data['fileid'] = (int)$data['fileid'];
|
||||
$data['parent'] = (int)$data['parent'];
|
||||
|
@ -164,7 +163,6 @@ class Cache implements ICache {
|
|||
$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']);
|
||||
if ($data['storage_mtime'] == 0) {
|
||||
|
|
|
@ -62,7 +62,7 @@ class CacheEntry implements ICacheEntry, \ArrayAccess {
|
|||
}
|
||||
|
||||
public function getStorageId() {
|
||||
return $this->data['storage_id'];
|
||||
return $this->data['storage'];
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -853,7 +853,6 @@ class DefaultShareProvider implements IShareProvider {
|
|||
$entryData['permissions'] = $entryData['f_permissions'];
|
||||
$entryData['parent'] = $entryData['f_parent'];;
|
||||
$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
|
||||
$entryData['storage_string_id'],
|
||||
\OC::$server->getMimeTypeLoader()));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue