From 3504f576e3dc062e43fbfcc7e1981c3b3ae3fb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Avil=C3=A9s?= <aavilesd@cern.ch>
Date: Wed, 25 Mar 2015 14:08:53 +0100
Subject: [PATCH] Piwik: Make tracking code work with Piwik v2.2.0

---
 piwik/indico_piwik/templates/tracking.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/piwik/indico_piwik/templates/tracking.html b/piwik/indico_piwik/templates/tracking.html
index dc06d06..d623e5b 100644
--- a/piwik/indico_piwik/templates/tracking.html
+++ b/piwik/indico_piwik/templates/tracking.html
@@ -1,7 +1,9 @@
 <!-- Piwik -->
-<script type="text/javascript">
-
+<script>
+    var _paq = _paq || [];
     (function() {
+        'use strict';
+
         var url = '//{{ server_url }}';
         var g = document.createElement('script');
         var s = document.getElementsByTagName('script')[0];
@@ -9,9 +11,10 @@
         g.defer = true;
         g.async = true;
         g.src = url + 'piwik.js';
+        g.onload = init_tracking;
         s.parentNode.insertBefore(g, s);
 
-        window.piwikAsyncInit = function() {
+        function init_tracking() {
             try {
                 track_site();
                 {% if event_id %}
@@ -20,14 +23,14 @@
             } catch(err) {}
         }
 
-        track_site = function() {
+        function track_site() {
             var general_tracker = Piwik.getTracker(url + 'piwik.php', {{ site_id_general }});
             general_tracker.enableLinkTracking();
             general_tracker.trackPageView();
         }
 
         {% if event_id %}
-            track_event = function() {
+            function track_event() {
                 var event_tracker = Piwik.getTracker(url + 'piwik.php', {{ site_id_events }});
                 event_tracker.enableLinkTracking();
                 event_tracker.setCustomVariable(1, 'Conference', '{{ event_id }}', 'page');