Fix HTML in site messages #5358
Conversation
If we detect that a site message contains HTML then don't use the html_para filter to avoid adding extra <br> elements which mess up spacing.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5358 +/- ##
=======================================
Coverage 82.42% 82.42%
=======================================
Files 416 416
Lines 32925 32926 +1
Branches 5289 5289
=======================================
+ Hits 27138 27140 +2
+ Misses 4225 4224 -1
Partials 1562 1562 ☔ View full report in Codecov by Sentry. |
| @@ -1432,6 +1432,7 @@ sub site_message { | |||
| my $ooh = $self->ooh_times($body); | |||
| $msg = $ooh_msg if $ooh->active; | |||
| } | |||
| $msg =~ s/\r\n/\n/g; | |||
There was a problem hiding this comment.
What's this bit for? To make the test simpler?
| @@ -1,7 +1,11 @@ | |||
| [% site_message = c.cobrand.site_message %] | |||
| [% IF site_message && !rendered_site_message %] | |||
| <div class="site-message"> | |||
| [% IF site_message.match('<[a-z][\s\S]*>', 'i') %] | |||
There was a problem hiding this comment.
There are some other places this would be good - report/new/form_after_heading.html for the reporting message, base/peterborough waste/header.html for waste, and templates/web/bathnes/around/_postcode_form_post.html. Perhaps a new Filter in Template.pm that does this check and then calls html_paragraph or not, so it's hidden from the templates, could just have site_message | html_para_if_no_html or something like that?
If we detect that a site message contains HTML then don't use the html_para filter to avoid adding extra
elements which mess up spacing.
For FD-5103
Before
After