Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

XWIKI-17374: Fix escaping in property displayer #1315

Merged
merged 12 commits into from
Sep 24, 2020
Merged

XWIKI-17374: Fix escaping in property displayer #1315

merged 12 commits into from
Sep 24, 2020

Conversation

manuelleduc
Copy link
Contributor

No description provided.

@manuelleduc manuelleduc changed the title Xwiki 17374 XWIKI-17374: Fix escaping in property displayer Jun 4, 2020
@manuelleduc manuelleduc force-pushed the XWIKI-17374 branch 2 times, most recently from 8539ecd to f0a446f Compare August 26, 2020 12:43
@manuelleduc
Copy link
Contributor Author

manuelleduc commented Sep 3, 2020 •
edited
Loading

This PR should not be merge until xwiki/xwiki-commons#102 is merged and build by the CI.

@surli
Copy link
Member

surli commented Sep 16, 2020

@manuelleduc I guess you need to update that one too now that xwiki/xwiki-commons#102 has been merged?

@manuelleduc
Copy link
Contributor Author

This PR is up to date in regard to xwiki/xwiki-commons#102.

tmortagne
tmortagne reviewed Sep 23, 2020
View reviewed changes
...orm-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java Outdated
BaseProperty property = (BaseProperty) object.safeget(name);
String content;
if (property != null) {
content = property.toText();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have put the buffer.append directly in the if instead of going through a content variable but I guess it's a matter of taste.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Else branch removed https://github.com/xwiki/xwiki-platform/pull/1315/files#diff-8574f36522a5e8eab9ad2acf469c1ef0R133

tmortagne
tmortagne reviewed Sep 23, 2020
View reviewed changes
...m-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/TextAreaClass.java Outdated
BaseProperty property = (BaseProperty) object.safeget(name);
String content;
if (property != null) {
content = property.toText();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar comment than above but with the following if instead of just a buffer.append (i.e. avoid useless work when the property is null).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Else branch removed here too https://github.com/xwiki/xwiki-platform/pull/1315/files#diff-912dd4275a5ac5f2116abef20711b489R384

@surli surli merged commit 82c31ea into xwiki:master Sep 24, 2020
surli pushed a commit that referenced this pull request Sep 24, 2020
@manuelleduc @surli
XWIKI-17374: Fix escaping in property displayer (#1315)
4ff71b3 
(cherry picked from commit 82c31ea)
surli pushed a commit that referenced this pull request Sep 24, 2020
@manuelleduc @surli
XWIKI-17374: Fix escaping in property displayer (#1315)
a6d893c 
(cherry picked from commit 82c31ea)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@surli surli surli approved these changes

@mflorea mflorea mflorea left review comments

@vmassol vmassol vmassol left review comments

@tmortagne tmortagne tmortagne approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@manuelleduc @surli @tmortagne @vmassol @mflorea