Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: encode image filename so '[', ']' and '|' doesn't break the markdown

This commit is contained in:
Régis Hanol 2018-01-19 19:52:03 +01:00
parent 645c32758a
commit f674b9e86e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -291,13 +291,13 @@ function isGUID(value) {
function imageNameFromFileName(fileName) { function imageNameFromFileName(fileName) {
const split = fileName.split('.'); const split = fileName.split('.');
const name = split[split.length-2]; let name = split[split.length - 2];
if (exports.isAppleDevice() && isGUID(name)) { if (exports.isAppleDevice() && isGUID(name)) {
return I18n.t('upload_selector.default_image_alt_text'); name = I18n.t('upload_selector.default_image_alt_text');
} }
return name; return encodeURIComponent(name);
} }
export function allowsImages() { export function allowsImages() {

1
test/javascripts/lib/utilities-test.js.es6
View File

@ -123,6 +123,7 @@ var testUploadMarkdown = function(filename) {
QUnit.test("getUploadMarkdown", assert => { QUnit.test("getUploadMarkdown", assert => {
assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)'); assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
assert.equal(testUploadMarkdown("[foo|bar].png"),'![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)');
assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n'); assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
}); });