Fix HTML entities not decoded in comment just added #35054
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danxuliu
requested review from
skjnldsv,
Pytal,
a team and
szaimen
and removed request for
a team
|
/backport to stable25 |
|
/backport to stable24 |
|
/backport to stable23 |
violethaze74
approved these changes
Nov 9, 2022
|
/compile / |
Pytal
approved these changes
Nov 9, 2022
This will make possible to use it from files other than "GetComments.js". Signed-off-by: Daniel Calviño Sánchez <[email protected]>
The XML data received from the comments endpoint has an inconsistent encoding; some entities are encoded once and others are encoded twice. When the comment list is loaded the comments are fetched using GetComments, which handles all that, and therefore shows the messages and author names as expected. However, when a new comment is posted the list is not got again; instead the new comment is loaded from the comment data returned after posting it. This is done in NewComment, which did not decode the messages nor the author names, and therefore showed, for example, "&" instead of "&". To solve that now the same decoding logic used in GetComments is applied too in NewComment. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
danxuliu
force-pushed
the
fix-html-entities-not-decoded-in-comment-just-added
branch
from
1b70a7e
to
4fe5b9a
Compare
|
/compile amend / |
Done :-) |
Signed-off-by: nextcloud-command <[email protected]>
nextcloud-command
force-pushed
the
fix-html-entities-not-decoded-in-comment-just-added
branch
from
4fe5b9a
to
99b1d00
Compare
szaimen
added
4. to release
Pytal
deleted the
fix-html-entities-not-decoded-in-comment-just-added
branch
1 task
|
/backport to stable24 |
|
/backport to stable23 |
1 task
|
The backport to stable23 failed. Please do this backport manually. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #29029
The XML data received from the comments endpoint has an inconsistent encoding; some entities are encoded once and others are encoded twice. When the comment list is loaded the comments are fetched using
GetComments, which handles all that, and therefore shows the messages and author names as expected.However, when a new comment is posted the list is not got again; instead the new comment is loaded from the comment data returned after posting it. This is done in
NewComment, which did not decode the messages nor the author names, and therefore showed, for example,&instead of&.To solve that now the same decoding logic used in
GetCommentsis applied too inNewComment.@Pytal I extracted decodeHtmlEntities to its own file and I assigned the copyright of that file to you, as you added the original function. I hope that is fine :-)
How to test
John "The Hangman" Ruth< & >Result with this pull request
The text of the comment just added is
< & >, and it was sent byJohn "The Hangman" RuthResult without this pull request
The text of the comment just added is
&lt; & &gt;, and it was sent byJohn "The Hangman" Ruth; if the page is reloaded and the Comments tab is shown again now the message has the expected author and text