diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 14:37:16 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 14:37:16 +0200 |
| commit | 38e309b0fe5f18c22a6f1b175ff24345e78f1548 (patch) | |
| tree | 98bf97459059717506d8c2bbebd7ba5aaec940c2 /lib/private/share | |
| parent | 06d118d06c0def5a33aab64c6a2c20f79944b378 (diff) | |
| parent | 1bba2664175e7d8065748edef46705197ccaaa12 (diff) | |
| download | nextcloud-server-38e309b0fe5f18c22a6f1b175ff24345e78f1548.tar.gz nextcloud-server-38e309b0fe5f18c22a6f1b175ff24345e78f1548.zip | |
Merge pull request #9970 from owncloud/sharing_set_expire_date
Sharing set expire date
Diffstat (limited to 'lib/private/share')
| -rw-r--r-- | lib/private/share/share.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 0c42853302d..7fd5cd70e1d 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -595,6 +595,7 @@ class Share extends \OC\Share\Constants { $shareWith['group'] = $group; $shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner)); } else if ($shareType === self::SHARE_TYPE_LINK) { + $updateExistingShare = false; if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') { // when updating a link share @@ -629,7 +630,7 @@ class Share extends \OC\Share\Constants { throw new \Exception($message_t); } - if (!empty($updateExistingShare) && + if ($updateExistingShare === false && self::isDefaultExpireDateEnabled() && empty($expirationDate)) { $expirationDate = Helper::calcExpireDate(); |