summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-07 16:58:41 +0100
committerGitHub <noreply@github.com>2018-11-07 16:58:41 +0100
commitf77e24e725b2b61df9a30b0eed79c7f76a7fdbb5 (patch)
treee7304582204e982cdb3f43f6db33f4392439cbd9 /core
parent35a9c51efaeb863b45f01a5558433001928d5cc7 (diff)
parentd110f0c29c52fb9e0f8eace98d3cf3f6f63bb0c7 (diff)
downloadnextcloud-server-f77e24e725b2b61df9a30b0eed79c7f76a7fdbb5.tar.gz
nextcloud-server-f77e24e725b2b61df9a30b0eed79c7f76a7fdbb5.zip
Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-title
Also use default label if share label is null
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialoglinkshareview.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 4ce337357a0..e10193067db 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -825,7 +825,7 @@
return _.extend({}, share, {
cid: share.id,
shareAllowed: true,
- linkShareLabel: share.label !== '' ? share.label : t('core', 'Share link'),
+ linkShareLabel: share.label ? share.label : t('core', 'Share link'),
popoverMenu: {},
shareLinkURL: share.url,
newShareTitle: t('core', 'New share link'),