From dbfe9540fafd63ad3ab4d7e42cb2e32ce03df76a Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 25 Nov 2019 16:38:13 +1000 Subject: [PATCH] FIX: be more tactical with replacing markdown chars * instead of using encodeURIComponent in imageNameFromFileName, we just replace the bad characters that we wanted to get rid of in the first place where we introduced encodeURIComponent. as per review --- app/assets/javascripts/discourse/lib/uploads.js.es6 | 4 +++- test/javascripts/lib/uploads-test.js.es6 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js.es6 index fbd75fa364..89b8b973b6 100644 --- a/app/assets/javascripts/discourse/lib/uploads.js.es6 +++ b/app/assets/javascripts/discourse/lib/uploads.js.es6 @@ -14,7 +14,9 @@ function imageNameFromFileName(fileName) { name = I18n.t("upload_selector.default_image_alt_text"); } - return encodeURIComponent(name).replace(/%20/g, " "); + return name.replace(/\[|\]|\|/g, ""); + + // return encodeURIComponent(name).replace(/%20/g, " "); } export function validateUploadedFiles(files, opts) { diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js.es6 index 858dcb3a62..5d08ed2ea1 100644 --- a/test/javascripts/lib/uploads-test.js.es6 +++ b/test/javascripts/lib/uploads-test.js.es6 @@ -198,7 +198,7 @@ QUnit.test("getUploadMarkdown", assert => { ); assert.equal( testUploadMarkdown("[foo|bar].png"), - "![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)" + "![foobar|100x200](/uploads/123/abcdef.ext)" ); assert.equal( testUploadMarkdown("file name with space.png"),