From 0fa6f654724385718a51118efc143c68b434d622 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 22 Apr 2024 15:57:03 +0100
Subject: [PATCH] Update GA helper

Use updated core helper to add query string to URL.

Depends on https://github.com/mysociety/alaveteli/pull/8213
Fixes https://github.com/mysociety/alaveteli/issues/8211
---
 lib/helper_patches.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/helper_patches.rb b/lib/helper_patches.rb
index dc7b400b..cee96b20 100644
--- a/lib/helper_patches.rb
+++ b/lib/helper_patches.rb
@@ -10,11 +10,7 @@ def is_contact_page?
     end
 
     def request_url_with_query
-      uri = URI.parse(request.original_url);
-      uri.query = URI.encode_www_form(
-        URI.decode_www_form(String(uri.query)).push(['query', @query])
-      );
-      uri.to_s
+      add_query_params_to_url(request.original_url, query: @query)
     end
   end