Merge pull request #4668 from alphagov/simplify-utf-encode-feedback

Remove utf_encode method
alphagov · Mar 5, 2025 · 222cb59 · 222cb59
2 parents 76dc68b + d0255d9
commit 222cb59
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/app/views/govuk_publishing_components/components/_feedback.html.erb b/app/views/govuk_publishing_components/components/_feedback.html.erb
@@ -2,13 +2,9 @@
   add_gem_component_stylesheet("button")
   add_gem_component_stylesheet("feedback")
 
-  def utf_encode(element)
-    element.is_a?(String) ? element.encode : element
-  end
-
   email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
-  url_without_pii = utf_encode(request.original_url.gsub(email_regex, '[email]'))
-  path_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
+  url_without_pii = request.original_url.gsub(email_regex, '[email]').encode
+  path_without_pii = request.fullpath.gsub(email_regex, '[email]').encode
 
   disable_ga4 ||= false