From f9a0380eb1da63a9d70c039d458897aa2366b2ca Mon Sep 17 00:00:00 2001
From: Jasper Knockaert <jasper@knockaert.nl>
Date: Sat, 16 Jan 2021 14:33:44 +0100
Subject: consolidation of boolean expression
---
lib/private/Files/Storage/Wrapper/Encryption.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'lib/private/Files')
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
index b37fcdb2bd0..c4953eddf23 100644
--- a/lib/private/Files/Storage/Wrapper/Encryption.php
+++ b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -941,11 +941,8 @@ class Encryption extends Wrapper {
// if the header doesn't contain a encryption module we check if it is a
// legacy file. If true, we add the default encryption module
- if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY])) {
- if (!empty($result)) {
- $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
- } elseif ($exists) {
- $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
+ if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY] && (!empty($result) || $exists)) {
+ $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
}
}
}
--
cgit v1.2.3