Merge branch 'ven-com-fix_issue_with_system_config_path' into main

fnogatz · Jul 24, 2021 · d3ae5fe · d3ae5fe
2 parents 45388d3 + 7d9252a
commit d3ae5fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -23,6 +23,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
+        <!-- Prefix "piwik/" left for compatibility with Henhed_Piwik -->
         <section id="piwik"
                  translate="label"
                  type="text"
@@ -141,7 +142,7 @@
                            showInWebsite="1"
                            showInStore="1">
                         <label>PHP Script Path</label>
-                        <config_path>matomo/tracking/php_script_path</config_path>
+                        <config_path>piwik/tracking/php_script_path</config_path>
                         <comment>Path to the Matomo tracker PHP script. Usually &quot;matomo.php&quot;.</comment>
                         <frontend_class>required-entry</frontend_class>
                     </field>
@@ -153,7 +154,7 @@
                            showInWebsite="1"
                            showInStore="1">
                         <label>Javascript Path</label>
-                        <config_path>matomo/tracking/js_script_path</config_path>
+                        <config_path>piwik/tracking/js_script_path</config_path>
                         <comment>Path to the Matomo tracker Javascript. Usually &quot;matomo.js&quot;.</comment>
                         <frontend_class>required-entry</frontend_class>
                     </field>
@@ -165,7 +166,7 @@
                            showInWebsite="1"
                            showInStore="1">
                         <label>CDN Hostname</label>
-                        <config_path>matomo/tracking/cdn_hostname</config_path>
+                        <config_path>piwik/tracking/cdn_hostname</config_path>
                         <comment>Hostname for serving the Matomo tracker Javascript. May be left empty in which case the regular hostname will be used.</comment>
                     </field>
                 </group>

diff --git a/etc/config.xml b/etc/config.xml
@@ -23,6 +23,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
+        <!-- Prefix "piwik/" left for compatibility with Henhed_Piwik -->
         <piwik>
             <tracking>
                 <enabled>0</enabled>