wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix wrong conflict resolution

Browse source
This commit is contained in:
Morris Jobke 2014-05-19 01:53:20 +02:00
parent d273b55e98
commit f633fb537f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/share.js
View file

@ -669,7 +669,7 @@ $(document).ready(function() {
if (this.checked) { if (this.checked) {
// Create a link // Create a link
if (oc_appconfig.core.enforcePasswordForPublicLink === false) { 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.showLink(data.token, null, itemSource);
OC.Share.updateIcon(itemType, itemSource); OC.Share.updateIcon(itemType, itemSource);
}); });