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.

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

dev/core#3001 escape single quotes when rendering tokens in html format #22387

Merged
merged 4 commits into from
Jan 6, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

port fix from #22285

@civibot
Copy link

civibot bot commented Jan 6, 2022

(Standard links)

@civibot civibot bot added the master label Jan 6, 2022
@eileenmcnaughton eileenmcnaughton changed the base branch from master to 5.45 January 6, 2022 03:14
@civibot civibot bot added 5.45 and removed master labels Jan 6, 2022
@totten
Copy link
Member

totten commented Jan 6, 2022

Added the corresponding unit-test and update for the release-notes. Merge on pass.

@@ -132,6 +132,21 @@ public function getDateFormats(): array {
];
}

public function testTokenDataEscape() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ug - now you've ported it I'm gonna have to fix up the style issues

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(the reason I didn't port originally)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done - looks like the tests had only been running for 20 mins so ...

@totten
Copy link
Member

totten commented Jan 6, 2022

jenkins, test this please

@totten
Copy link
Member

totten commented Jan 6, 2022

All green.

@totten totten merged commit e96a108 into civicrm:5.45 Jan 6, 2022
@eileenmcnaughton eileenmcnaughton deleted the tok branch January 6, 2022 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants