[Pkg-owncloud-commits] [owncloud] 06/59: Fix for #9422

[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 1a01debe684e1beb10501409ec49b091847b4879
Author: Daniel Hansson <enoch85 at gmail.com>
Date:   Wed Jul 9 14:40:05 2014 +0200

    Fix for #9422
---
 lib/private/share/share.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index d356d60..691a205 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -946,22 +946,19 @@ class Share extends \OC\Share\Constants {
 		$query->bindValue(4, $user);
 		$query->bindValue(5, \OCP\Share::SHARE_TYPE_LINK);
 
-		$result = $query->execute();
-
-		if ($result === 1) {
-			\OC_Hook::emit('OCP\Share', 'post_set_expiration_date', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'date' => $date,
-				'uidOwner' => $user
-			));
-		} else {
-			\OCP\Util::writeLog('sharing', "Couldn't set expire date'", \OCP\Util::ERROR);
-		}
+		$query->execute();
 
-		return ($result === 1) ? true : false;
-	}
+		\OC_Hook::emit('OCP\Share', 'post_set_expiration_date', array(
+			'itemType' => $itemType,
+			'itemSource' => $itemSource,
+			'date' => $date,
+			'uidOwner' => $user
+		));
+	
+		return true;
 
+        }
+        
 	/**
 	 * Checks whether a share has expired, calls unshareItem() if yes.
 	 * @param array $item Share data (usually database row)

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