Editing a comment within Blacklist/Whitelist that contains apostrophe symbol (') gets changed to ' after confirming

[DinoBrdar92]

Versions

• Pi-hole: v5.11.4
• AdminLTE: v5.13
• FTL: v5.16.1

Platform

• OS and version: Windows 10 Education x64 21H2

• Platform: Raspberry Pi 4 model B

Expected behavior

Writing a comment within Blacklist/Whitelist with an apostrophe (') should have an apostrophe after confirming my comment

Actual behavior / bug

Writing a comment within Blacklist/Whitelist that contains apostrophe (') gets changed to ' after confirming

Steps to reproduce

Steps to reproduce the behavior:

1. Go to 'Blacklist or Whitelist'
2. Edit comment of any of the entries (add an entry first if there's none) and write ' in it
3. Click anywhere to confirm editing
4. See error: ' should change to '

Debug Token

• URL: https://tricorder.pi-hole.net/jNJgwBGi/

Screenshots

Screenshot from Reddit post here

[andrewmccarthy]

Comparing groups-adlists.php and groups-domains.php they both seem to work the same. Also, in both cases they store an apostrophe in the database as '. The difference is at lines 520-522 at script/.../groups.php, where for get_domains the comment and domain fields are passed through htmlentities() (thus turning ' into '), but for get_adlists they aren't.

[yubiuser]

Will be fixed by #2851 in v6