Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon

pull/1/head
ansuz 5 years ago
commit 96b92f472c

@ -146,6 +146,17 @@ define([
if (data.href) { data.href = base + data.href; } if (data.href) { data.href = base + data.href; }
if (data.roHref) { data.roHref = base + data.roHref; } if (data.roHref) { data.roHref = base + data.roHref; }
}), opts.href); }), opts.href);
// If this is a file, don't try to look for metadata
if (opts.channel && opts.channel.length > 34) { return; }
common.getPadMetadata({
channel: opts.channel // optional, fallback to current pad
}, waitFor(function (obj) {
if (obj && obj.error) { return; }
data.owners = obj.owners;
data.expire = obj.expire;
data.pending_owners = obj.pending_owners;
}));
}).nThen(function () { }).nThen(function () {
cb(void 0, data); cb(void 0, data);
}); });

Loading…
Cancel
Save