summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-24 15:20:00 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-24 15:20:00 +0200
commit846b8268672df2c626616fec5f71e15570005e84 (patch)
treee4f1f8ee1bc4866521dfe03dc239429b84540c24 /core/js
parent30377e958f8a7a8aa15c62f2c3977349faf66ea1 (diff)
parent04b14df35ca05e49194534a7c14ee2ab9199e4bb (diff)
downloadnextcloud-server-846b8268672df2c626616fec5f71e15570005e84.tar.gz
nextcloud-server-846b8268672df2c626616fec5f71e15570005e84.zip
Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
Diffstat (limited to 'core/js')
-rw-r--r--core/js/oc-dialogs.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 719ac8587a4..38b91be9d2e 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -388,9 +388,9 @@ var OCdialogs = {
c: original.etag,
forceIcon: 0
};
- var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+ var previewpath = Files.generatePreviewUrl(urlSpec);
// Escaping single quotes
- previewpath = previewpath.replace(/'/g, "%27")
+ previewpath = previewpath.replace(/'/g, "%27");
$originalDiv.find('.icon').css({"background-image": "url('" + previewpath + "')"});
getCroppedPreview(replacement).then(
function(path){