Merge pull request #3978 from oat-sa/fix/TR-6036/google-tags-rendering

fix google tag rendering
oat-sa · Mar 13, 2024 · 25747b1 · 25747b1
2 parents 4405ac4 + bae51ab
commit 25747b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/helpers/Layout.php b/helpers/Layout.php
@@ -591,10 +591,10 @@ public static function getThemeStylesheet($target)
     /**
      * Returns the necessary analytics code.
      */
-    public static function getAnalyticsCode(): void
+    public static function printAnalyticsCode(): void
     {
-        $gaTag = getenv('GA_TAG');
-        $environment = getenv('NODE_ENV') === 'production' ? 'Production' : 'Internal';
+        $gaTag = $_ENV['GA_TAG'] ?? '';
+        $environment = isset($_ENV['NODE_ENV']) && $_ENV['NODE_ENV'] === 'production' ? 'Production' : 'Internal';
 
         if ($gaTag && method_exists(self::$templateClass, 'inc')) {
             call_user_func(

diff --git a/test/unit/helpers/LayoutTest.php b/test/unit/helpers/LayoutTest.php
@@ -20,11 +20,11 @@ protected function tearDown(): void
         TemplateMock::resetCalls();
     }
 
-    public function testGetAnalyticsCodeWithGaTag(): void
+    public function testPrintAnalyticsCodeWithGaTag(): void
     {
         $this->setEnv('GA_TAG', 'dummy-ga-tag');
 
-        Layout::getAnalyticsCode();
+        Layout::printAnalyticsCode();
 
         self::assertSame(
             [
@@ -43,11 +43,11 @@ public function testGetAnalyticsCodeWithGaTag(): void
         );
     }
 
-    public function testGetAnalyticsCodeWithoutGaTag(): void
+    public function testPrintAnalyticsCodeWithoutGaTag(): void
     {
         $this->setEnv('GA_TAG', '');
 
-        Layout::getAnalyticsCode();
+        Layout::printAnalyticsCode();
 
         self::assertSame(
             [],

diff --git a/views/templates/layout.tpl b/views/templates/layout.tpl
@@ -54,6 +54,6 @@ $hasVersionWarning = empty($_COOKIE['versionWarning'])
 <?=Layout::renderThemeTemplate(Theme::CONTEXT_BACKOFFICE, 'footer')?>
 
 <div class="loading-bar"></div>
-<? Layout::getAnalyticsCode(); ?>
+<?php Layout::printAnalyticsCode(); ?>
 </body>
 </html>