diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-26 15:56:47 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-26 15:56:47 +0100 |
| commit | 01fcc080bb5c280147d53bd6eee14655f5fefe87 (patch) | |
| tree | 09c63e39ad6c761dba5f4ecbd049c058976723b2 /apps | |
| parent | 857535403c7cdd489ec8f658b973c60ebb27e824 (diff) | |
| download | nextcloud-server-01fcc080bb5c280147d53bd6eee14655f5fefe87.tar.gz nextcloud-server-01fcc080bb5c280147d53bd6eee14655f5fefe87.zip | |
dont set the encryption flag for existing non-encrypted files
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index bd98b98bbad..c1c26d7754f 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -107,10 +107,9 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ } public function postGetMimeType($path,$mime){ - if((!OC_FileCache::inCache($path) and self::shouldEncrypt($path)) or self::isEncrypted($path)){ - return OC_Helper::getMimeType('crypt://'.$path,'w'); - }else{ - return $mime; + if(self::isEncrypted($path)){ + $mime=OC_Helper::getMimeType('crypt://'.$path,'w'); } + return $mime; } } |