From 53f6ca54fd728220229937a1250ac9ddf53746c0 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 24 Mar 2020 18:33:21 +0400
Subject: [PATCH] PHRAS-2997

---
 resources/hudson/_GV.php                           | 4 ++--
 templates/mobile/common/matomo_analytics.html.twig | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/hudson/_GV.php b/resources/hudson/_GV.php
index 7c95d79cdd..808768544e 100644
--- a/resources/hudson/_GV.php
+++ b/resources/hudson/_GV.php
@@ -84,7 +84,7 @@ define('GV_homeTitle', 'SuperPhraseanet');
 define('GV_metaKeywords', '');
 define('GV_metaDescription', '');
 define('GV_googleAnalytics', '');
-define('GV_matomoUrl', '');
-define('GV_matomoId', '');
+define('GV_matomoAnalyticsUrl', '');
+define('GV_matomoAnalyticsId', '');
 define('GV_allow_search_engine', true);
 define('GV_display_gcf', true);
diff --git a/templates/mobile/common/matomo_analytics.html.twig b/templates/mobile/common/matomo_analytics.html.twig
index affad06a56..5c1e3251ac 100644
--- a/templates/mobile/common/matomo_analytics.html.twig
+++ b/templates/mobile/common/matomo_analytics.html.twig
@@ -1,14 +1,14 @@
-{% if app['conf'].get(['registry', 'general', 'matomo-url']) != '' %}
-{% if app['conf'].get(['registry', 'general', 'matomo-id']) != '' %}
+{% if app['conf'].get(['registry', 'general', 'matomo-analytics-url']) != '' %}
+{% if app['conf'].get(['registry', 'general', 'matomo-analytics-id']) != '' %}
     <!-- Matomo -->
     <script type="text/javascript">
         var _paq = window._paq || [];
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function() {
-            var u="//{{ app['conf'].get(['registry', 'general', 'matomo-url']) }}/";
+            var u="//{{ app['conf'].get(['registry', 'general', 'matomo-analytics-url']) }}/";
             _paq.push(['setTrackerUrl', u+'matomo.php']);
-            _paq.push(['setSiteId',  {{ app['conf'].get(['registry', 'general', 'matomo-id']) }}]);
+            _paq.push(['setSiteId',  {{ app['conf'].get(['registry', 'general', 'matomo-analytics-id']) }}]);
             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
             g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
         })();