diff -r 24067001082c -r 9bbc657f6837 src/cm/templates/site/tracking.html
--- a/src/cm/templates/site/tracking.html	Wed Apr 30 18:39:32 2014 +0200
+++ b/src/cm/templates/site/tracking.html	Tue May 06 13:52:01 2014 +0200
@@ -1,8 +1,4 @@
-{% if DISABLE_TRACKING %}
-
-{% else %}
-
-{% autoescape off %}{{ TRACKING_HTML }}{% endautoescape %}
+{% if TRACKING_ID %}
 
 <!-- Piwik -->
 <script type="text/javascript">
@@ -27,7 +23,7 @@
   (function() {
     var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.co-ment.com/";
     _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "17"]);
+    _paq.push(["setSiteId", "{{ TRACKING_ID }}"]);
     var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
     g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
   })();