fix wrong conflict resolution

12 years ago · f633fb537f
parent d273b55e98
commit f633fb537f
1 changed files with 1 additions and 1 deletions
--- 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);
 				});