[Pkg-owncloud-commits] [owncloud] 40/61: make sure that we set the expire date if a date is adefault date is set

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 0b8135dcc468bc35fee96595c1fadb0636c6db3e
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Jul 28 17:13:17 2014 +0200

    make sure that we set the expire date if a date is adefault date is set
---
 lib/private/share/share.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 0c42853..7fd5cd7 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git