diff options
| author | Miguel Prokop <miguel.prokop@vtu.com> | 2014-11-21 13:31:56 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-26 13:04:20 +0100 |
| commit | b96b601017a822079dfdc656663514674a8c5e38 (patch) | |
| tree | c685209532750e323468c9fb9dfe322d931b99c3 /lib/private/share | |
| parent | cdf37a061bb95e0695adc7b787be799570a4123c (diff) | |
| download | nextcloud-server-b96b601017a822079dfdc656663514674a8c5e38.tar.gz nextcloud-server-b96b601017a822079dfdc656663514674a8c5e38.zip | |
Consolidate if statement, and update unit test
Diffstat (limited to 'lib/private/share')
| -rw-r--r-- | lib/private/share/helper.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 1ebcdb563a5..6bbb101db3a 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -204,10 +204,8 @@ class Helper extends \OC\Share\Constants { } else { $expires = $userExpireDate; } - } else { - if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) { - $expires = $defaultExpires; - } + } else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) { + $expires = $defaultExpires; } return $expires; |