mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always use numeric storage id in cacheentry 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-12-13 12:53:38 +01:00
parent 86473306f3
commit 14a561ddad
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/Cache/Cache.php
View File

@ -142,7 +142,7 @@ class Cache implements ICache {
} }
return $data; return $data;
} else { } 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 * Create a CacheEntry from database row
* *
* @param array $data * @param array $data
* @param string $storageId
* @param IMimeTypeLoader $mimetypeLoader * @param IMimeTypeLoader $mimetypeLoader
* @return CacheEntry * @return CacheEntry
*/ */
public static function cacheEntryFromData($data, $storageId, IMimeTypeLoader $mimetypeLoader) { public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
//fix types //fix types
$data['fileid'] = (int)$data['fileid']; $data['fileid'] = (int)$data['fileid'];
$data['parent'] = (int)$data['parent']; $data['parent'] = (int)$data['parent'];
@ -164,7 +163,6 @@ class Cache implements ICache {
$data['encryptedVersion'] = (int)$data['encrypted']; $data['encryptedVersion'] = (int)$data['encrypted'];
$data['encrypted'] = (bool)$data['encrypted']; $data['encrypted'] = (bool)$data['encrypted'];
$data['storage_id'] = $data['storage']; $data['storage_id'] = $data['storage'];
$data['storage'] = $storageId;
$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']); $data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']); $data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
if ($data['storage_mtime'] == 0) { if ($data['storage_mtime'] == 0) {

2
lib/private/Files/Cache/CacheEntry.php
View File

@ -62,7 +62,7 @@ class CacheEntry implements ICacheEntry, \ArrayAccess {
} }
public function getStorageId() { public function getStorageId() {
return $this->data['storage_id']; return $this->data['storage'];
} }

1
lib/private/Share20/DefaultShareProvider.php
View File

@ -853,7 +853,6 @@ class DefaultShareProvider implements IShareProvider {
$entryData['permissions'] = $entryData['f_permissions']; $entryData['permissions'] = $entryData['f_permissions'];
$entryData['parent'] = $entryData['f_parent'];; $entryData['parent'] = $entryData['f_parent'];;
$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData, $share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
$entryData['storage_string_id'],
\OC::$server->getMimeTypeLoader())); \OC::$server->getMimeTypeLoader()));
} }