web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong fileHost when displaying thumbnails

Browse Source
This commit is contained in:
yflory 2019-08-27 13:46:09 +02:00
parent a73e48de80
commit 86548e5cc1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-thumbnail.js
View File

@ -289,9 +289,11 @@ define([
var parsed = Hash.parsePadUrl(href); var parsed = Hash.parsePadUrl(href);
var k = getKey(parsed.type, channel); var k = getKey(parsed.type, channel);
var whenNewThumb = function () { var whenNewThumb = function () {
var privateData = common.getMetadataMgr().getPrivateData();
var fileHost = privateData.fileHost || privateData.origin;
var secret = Hash.getSecrets('file', parsed.hash, password); var secret = Hash.getSecrets('file', parsed.hash, password);
var hexFileName = secret.channel; var hexFileName = secret.channel;
var src = Hash.getBlobPathFromHex(hexFileName); var src = fileHost + Hash.getBlobPathFromHex(hexFileName);
var key = secret.keys && secret.keys.cryptKey; var key = secret.keys && secret.keys.cryptKey;
FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) { FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
if (e) { if (e) {