[Pkg-owncloud-commits] [owncloud] 77/153: fix wrong conflict resolution

[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 f633fb537fc3a551dcb623bb8132d003c4e3702e
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon May 19 01:53:20 2014 +0200

    fix wrong conflict resolution
---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index f1d89ae..92db671 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -669,7 +669,7 @@ $(document).ready(function() {
 		if (this.checked) {
 			// Create a link
 			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
-				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, function(data) {
+				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expirationDate, function(data) {
 					OC.Share.showLink(data.token, null, itemSource);
 					OC.Share.updateIcon(itemType, itemSource);
 				});

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