From f633fb537fc3a551dcb623bb8132d003c4e3702e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 19 May 2014 01:53:20 +0200
Subject: fix wrong conflict resolution

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

(limited to 'core/js')

diff --git a/core/js/share.js b/core/js/share.js
index f1d89ae8362..92db67117be 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);
 				});
-- 
cgit v1.2.3