fix wrong conflict resolution

requist · May 18, 2014 · f633fb5 · f633fb5
1 parent d273b55
commit f633fb5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 				});