Merge remote-tracking branch 'upstream/pull/4770'

[rails.git] / app / views / layouts / site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb

index 69ac7aa023a193cc40fad42a2c9a7393b0cb5cad..7c921658d46102d54b720eb5deb57a7107f07d9b 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -4,8 +4,8 @@
    <body class="<%= body_class %>">
      <%= render :partial => "layouts/header" %>
      <%= render :partial => "layouts/content" %>
-    <% if defined?(PIWIK) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" style="border:0" alt="" /></p></noscript>
+    <% if defined?(Settings.matomo) -%>
+    <noscript><p><img src="<%= request.protocol %><%= Settings.matomo["location"] %>/matomo.php?idsite=<%= Settings.matomo["site"] %>" class="matomo" alt="" /></p></noscript>
      <% end -%>
    </body>
  </html>