summaryrefslogtreecommitdiffstats
path: root/core/js/share.js
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2014-08-03 11:31:28 +0200
committerkondou <kondou@ts.unde.re>2014-09-04 15:23:55 +0200
commit2a4c51389c23ab1da47d52be9f2e76cd90f2df01 (patch)
treeb50145fa66fe889045a0dbac963dd4b9865bf827 /core/js/share.js
parent0f2ad9862e98e00fdc250bf8405bf6404d40b1ed (diff)
downloadnextcloud-server-2a4c51389c23ab1da47d52be9f2e76cd90f2df01.tar.gz
nextcloud-server-2a4c51389c23ab1da47d52be9f2e76cd90f2df01.zip
Use a route instead of s.php and convert tokens asap
Diffstat (limited to 'core/js/share.js')
-rw-r--r--core/js/share.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/js/share.js b/core/js/share.js
index d00b5f1ccf9..67ddd9c4870 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -663,8 +663,6 @@ OC.Share={
// TODO: use oc webroot ?
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
} else {
- // convert the token to base36
- //token = parseInt(token, 16).toString(36);
//TODO add path param when showing a link to file in a subfolder of a public link share
var service='';
if(linkSharetype === 'folder' || linkSharetype === 'file'){
@@ -677,7 +675,7 @@ OC.Share={
if (service !== 'files') {
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
} else {
- var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 's.php')+'?t='+token;
+ var link = parent.location.protocol+'//'+location.host+OC.generateUrl('/s/')+token;
}
}
$('#linkText').val(link);