Skip to content
Snippets Groups Projects
Commit 01fcc080 authored by Robin Appelman's avatar Robin Appelman
Browse files

dont set the encryption flag for existing non-encrypted files

parent 85753540
Branches
No related tags found
No related merge requests found
...@@ -107,10 +107,9 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ ...@@ -107,10 +107,9 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
} }
public function postGetMimeType($path,$mime){ public function postGetMimeType($path,$mime){
if((!OC_FileCache::inCache($path) and self::shouldEncrypt($path)) or self::isEncrypted($path)){ if(self::isEncrypted($path)){
return OC_Helper::getMimeType('crypt://'.$path,'w'); $mime=OC_Helper::getMimeType('crypt://'.$path,'w');
}else{
return $mime;
} }
return $mime;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment