From 178a8606b9b69db94bcd89c4642c8f6dce27b9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Mon, 27 Jun 2022 11:07:52 +0200
Subject: [PATCH] google analytics fix

---
 config/vuefilemanager.php                       | 2 +-
 resources/views/index.blade.php                 | 2 +-
 src/Domain/Settings/Actions/GetConfigAction.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php
index 12b47744..2d691dad 100644
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '2.2.0.9',
+    'version' => '2.2.0.10',
 
     'is_demo' => env('APP_DEMO', false),
 
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 50c7890c..94d89d8d 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -159,7 +159,7 @@
         <script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script>
 
         {{--Global site tag (gtag.js) - Google Analytics--}}
-        @if(isset($config->google_analytics) && $config->google_analytics)
+        @if($config->google_analytics)
             <script async src="https://www.googletagmanager.com/gtag/js?id={{ $config->google_analytics }}"></script>
             <script>
                 window.dataLayer = window.dataLayer || [];
diff --git a/src/Domain/Settings/Actions/GetConfigAction.php b/src/Domain/Settings/Actions/GetConfigAction.php
index 5414808c..5a64a47d 100644
--- a/src/Domain/Settings/Actions/GetConfigAction.php
+++ b/src/Domain/Settings/Actions/GetConfigAction.php
@@ -200,6 +200,7 @@ class GetConfigAction
             'allowHomepage'       => intval($settings->allow_homepage ?? 1),
             'teamsDefaultMembers' => intval($settings->default_max_team_member ?? 10),
             'legal'               => $pages ? json_encode($pages) : 'undefined',
+            'google_analytics'    => optional($settings)->google_analytics ?? null,
         ];
     }
 }