From faaebe14a8dfba757db560daba8c0c15fc22a2c8 Mon Sep 17 00:00:00 2001
From: "Robert J. Lang" <robert@langorigami.com>
Date: Wed, 6 Jul 2022 15:03:54 -0700
Subject: [PATCH] Issue 27: Eliminate undefined variable warning

---
 googleanalytics.module | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/googleanalytics.module b/googleanalytics.module
index 15875a1..ed1fce6 100644
--- a/googleanalytics.module
+++ b/googleanalytics.module
@@ -268,7 +268,7 @@ function googleanalytics_preprocess_layout() {
       }
       $custom_var .= 'gtag("event", "custom", ' . backdrop_json_encode($custom_vars) . ');';
     };
-    
+
     // Build tracker code.
     $script = 'window.dataLayer = window.dataLayer || [];';
     $script .= 'function gtag(){dataLayer.push(arguments)};';
@@ -281,7 +281,7 @@ function googleanalytics_preprocess_layout() {
 
     // Build the arguments fields list.
     // https://developers.google.com/analytics/devguides/collection/gtagjs/sending-data
-    $create_only_fields = array_merge($create_only_fields, $codesnippet_create);
+    $create_only_fields = $codesnippet_create;
 
     // Domain tracking type.
     global $cookie_domain;
@@ -316,7 +316,7 @@ function googleanalytics_preprocess_layout() {
     if (variable_get('googleanalytics_tracker_anonymizeip', 1)) {
       $create_only_fields['anonymize_ip'] = TRUE;
     }
-    
+
     if (!empty($url_custom)) {
       $create_only_fields['page_path'] = 'PLACEHOLDER_URL_CUSTOM';
     }
@@ -337,7 +337,7 @@ function googleanalytics_preprocess_layout() {
     $arguments_json = backdrop_json_encode($create_only_fields);
     // backdrop_json_encode() cannot convert every data type properly.
     $arguments_json = str_replace('"PLACEHOLDER_URL_CUSTOM"', $url_custom, $arguments_json);
-    
+
     // Create a tracker.
     if (!empty($codesnippet_before)) {
       $script .= $codesnippet_before;
@@ -348,7 +348,7 @@ function googleanalytics_preprocess_layout() {
 
     // Prepare Adsense tracking.
     $googleanalytics_adsense_script .= 'window.google_analytics_uacct = ' . backdrop_json_encode($id_list[0]) . ';';
-  
+
     if (!empty($custom_var)) {
       $script .= $custom_var;
     }