diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-05-19 01:53:20 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-05-19 01:53:20 +0200 |
| commit | f633fb537fc3a551dcb623bb8132d003c4e3702e (patch) | |
| tree | fffcf48a0d01b798eeca2899c947134e010d73a8 /core/js | |
| parent | d273b55e986488b9c24d0b2c27130221333d7ac9 (diff) | |
| download | nextcloud-server-f633fb537fc3a551dcb623bb8132d003c4e3702e.tar.gz nextcloud-server-f633fb537fc3a551dcb623bb8132d003c4e3702e.zip | |
fix wrong conflict resolution
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/share.js | 2 |
1 files changed, 1 insertions, 1 deletions
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); }); |