fix: escaping custom templates used with ckeditor #7152
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
bradymiller
reviewed
Jan 8, 2024
| @@ -168,7 +168,7 @@ function check_user_category(form, selectFrom, selectedList) { | |||
| } | |||
| jsub_sortNow(form.elements[selectFrom]); | |||
| if (msg != '') { | |||
| if (confirm("<?php echo addslashes(xl('The following categories will be removed from your category List'));?> \n" + msg + "\n <?php echo addslashes(xl('Do you want to continue?'));?>")) { | |||
| if (confirm("<?php echo xlt('The following categories will be removed from your category List');?> \n" + xlj(msg) + "\n <?php echo xlt('Do you want to continue?');?>")) { | |||
There was a problem hiding this comment.
use xlj and note removal of quotes (also no need to escape msg)
if (confirm(<?php echo xlj('The following categories will be removed from your category List');?> + "\n" + msg + "\n" + <?php echo xlj('Do you want to continue?');?>)) {
|
@stephenwaite , Just noted one minor issue. Otherwise looks great.
|
sjpadgett
added a commit
to sjpadgett/openemr
that referenced
this pull request
Jan 12, 2024
…le_manager * 'master' of https://github.com/openemr/openemr: fix: escaping custom templates used with ckeditor (openemr#7152)
sjpadgett
pushed a commit
to sjpadgett/openemr
that referenced
this pull request
Feb 21, 2024
* fix: escaping custom templates used with ckeditor * xlj clean up (cherry picked from commit d2c332c)
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.
Fixes #7151
Short description of what this resolves:
Changes proposed in this pull request: