Merge pull request #9707 from flamber/fix9464

Stop loading GA script if Anonymous Tracking is opt-out

resources/frontend_client/index_template.html

@@ -80,19 +80,17 @@
         </script>
 
         <script type="text/javascript">
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-            // if we are not doing tracking then go ahead and disable GA now so we never even track the initial pageview
+            // if Anonymous Tracking is opt-out, then do not load script
             const tracking = window.MetabaseBootstrap.anon_tracking_enabled;
-            const ga_code = window.MetabaseBootstrap.ga_code;
-            if (!tracking) {
-                window['ga-disable-'+ga_code] = true;
-            }
+            if (tracking) {
+                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-            ga('create', ga_code, 'auto');
+                const ga_code = window.MetabaseBootstrap.ga_code;
+                ga('create', ga_code, 'auto');
+            }
         </script>
     </body>
 </html>