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

Fix the wrong escaping on settings datatable #2100

Merged
merged 3 commits into from
Jan 30, 2022
Merged

Fix the wrong escaping on settings datatable #2100

merged 3 commits into from
Jan 30, 2022

Conversation

rdwebdesign
Copy link
Member

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Fix #1513

How does this PR accomplish the above?:

The datatable formarter render: $.fn.dataTable.render.text() escapes every HTML tag inside the cell, transforming <i>unknown</i> into &lt;i&gt;unknown&lt;/i&gt;.

What documentation changes (if any) are needed to support this PR?:

none

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
@DL6ER DL6ER merged commit bf82c47 into devel Jan 30, 2022
@DL6ER DL6ER deleted the fix_escaping branch January 30, 2022 13:46
@yubiuser yubiuser linked an issue Jan 31, 2022 that may be closed by this pull request
3 tasks
@yubiuser
Copy link
Member

yubiuser commented Jan 31, 2022

@rdwebdesign
Copy link
Member Author

rdwebdesign commented Jan 31, 2022

I did not follow the code completely but this looks suspicious as well

No.

The line 601 includes a <i> tag for a different element (to format the tooltip text).
This element will not be touched by javascript function, so it will not cause problems.

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-14-web-v5-11-and-core-v5-9-released/53529/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

HTML code escaping into GUI
4 participants