Two minor updates to the variable_set() fix.

Jen Lampton · Jen Lampton · commit 1e396cf502cb · 2023-05-29T15:20:11.000-07:00
diff --git a/googleanalytics.module b/googleanalytics.module
@@ -386,9 +386,9 @@ function googleanalytics_preprocess_layout() {
       // @FIXME: Cannot find the debug URL!???
       $library = 'https://www.googletagmanager.com/gtag/js?id=' . $id_list[0];
     }
-    elseif ($config->get('googleanalytics_cache') && $url = _googleanalytics_cache('https://www.googletagmanager.com/gtag/js')) {
+    elseif ($config->get('cache') && $url = _googleanalytics_cache('https://www.googletagmanager.com/gtag/js')) {
       // Should a local cached copy of gtag.js be used?
-      $query_string = '?' . state_get('css_js_query_string', '0');
+      $query_string = '?' . state_get('css_js_query_string', base_convert(REQUEST_TIME, 10, 36));
       $library = $url . $query_string;
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -386,9 +386,9 @@ function googleanalytics_preprocess_layout() {`
`386`	`386`	`// @FIXME: Cannot find the debug URL!???`
`387`	`387`	`$library = 'https://www.googletagmanager.com/gtag/js?id=' . $id_list[0];`
`388`	`388`	`}`
`389`		`- elseif ($config->get('googleanalytics_cache') && $url = _googleanalytics_cache('https://www.googletagmanager.com/gtag/js')) {`
	`389`	`+ elseif ($config->get('cache') && $url = _googleanalytics_cache('https://www.googletagmanager.com/gtag/js')) {`
`390`	`390`	`// Should a local cached copy of gtag.js be used?`
`391`		`- $query_string = '?' . state_get('css_js_query_string', '0');`
	`391`	`+ $query_string = '?' . state_get('css_js_query_string', base_convert(REQUEST_TIME, 10, 36));`
`392`	`392`	`$library = $url . $query_string;`
`393`	`393`	`}`
`394`	`394`	`else {`