summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-07-28 17:13:17 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-07-30 15:32:11 +0200
commit0b8135dcc468bc35fee96595c1fadb0636c6db3e (patch)
tree3f526d8642d964276e4dbf80f4cb87e104272eb2 /lib
parent8f9deb118aabcd9dc94bb99cbeec56199a7cdd29 (diff)
downloadnextcloud-server-0b8135dcc468bc35fee96595c1fadb0636c6db3e.tar.gz
nextcloud-server-0b8135dcc468bc35fee96595c1fadb0636c6db3e.zip
make sure that we set the expire date if a date is adefault date is set
Diffstat (limited to 'lib')
-rw-r--r--lib/private/share/share.php3
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();