From 54004118c63f805f15ef29b8b22235be471623e2 Mon Sep 17 00:00:00 2001 From: Daniel Pan Date: Tue, 18 Jan 2022 22:04:04 +0800 Subject: [PATCH] Revert "repair code bug" --- frontend/src/markdown-editor.js | 2 +- frontend/src/shared-file-view-markdown.js | 3 +-- seahub/views/file.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/src/markdown-editor.js b/frontend/src/markdown-editor.js index 2a9c0bbf0b..76c5c233ea 100644 --- a/frontend/src/markdown-editor.js +++ b/frontend/src/markdown-editor.js @@ -26,7 +26,7 @@ const { siteRoot, serviceUrl, seafileCollabServer } = window.app.config; const userInfo = window.app.userInfo; const userName = userInfo.username; let dirPath = Utils.getDirName(filePath); -const IMAGE_SUFFIXES = ['png', 'PNG', 'jpg', 'JPG', 'jpeg', 'JPEG', 'gif', 'GIF']; +const IMAGE_SUFFIXES = ['png', 'PNG', 'jpg', 'JPG', 'gif', 'GIF']; function getImageFileNameWithTimestamp() { var d = Date.now(); diff --git a/frontend/src/shared-file-view-markdown.js b/frontend/src/shared-file-view-markdown.js index 1d8d259fd6..3995267b94 100644 --- a/frontend/src/shared-file-view-markdown.js +++ b/frontend/src/shared-file-view-markdown.js @@ -55,8 +55,7 @@ class FileContent extends React.Component { let index2 = imagePath.indexOf('?'); imagePath = imagePath.substring(index + 5, index2); // change image url - // the image path has been encoded when inserting the image - innerNode.data.src = serviceURL + '/view-image-via-share-link/?token=' + sharedToken + '&path=' + imagePath; + innerNode.data.src = serviceURL + '/view-image-via-share-link/?token=' + sharedToken + '&path=' + Utils.encodePath(imagePath); } return innerNode; } diff --git a/seahub/views/file.py b/seahub/views/file.py index 5be38d6efc..0190820af4 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -1972,9 +1972,8 @@ def view_media_file_via_share_link(request): # Translation ‘(’ ')' image_file_name = image_file_name.replace('(', '\(') image_file_name = image_file_name.replace(')', '\)') - encoded_image_file_name = urllib.parse.quote(image_file_name) - p = re.compile('(%s)/lib/(%s)/file(.*?)%s\?raw=1' % (serviceURL, repo_id, encoded_image_file_name)) + p = re.compile('(%s)/lib/(%s)/file(.*?)%s\?raw=1' % (serviceURL, repo_id, image_file_name)) result = re.search(p, file_content) if not result: return render_error(request, 'Image does not exist')