Merge pull request #522 from pmclanahan/bug-818195-fix-google-analytics

Bug 818195: Fix google analytics variables.

templates/includes/google-analytics.html

@@ -1,22 +1,20 @@
 <script>
 var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '{{ settings.GA_ACCOUNT_CODE }}']);
-_gaq.push(['_trackPageview']);
-
-// In-page analysis
 var pluginUrl = '//www.google-analytics.com/plugins/ga/inpage_linkid.js';
 _gaq.push(['_require', 'inpage_linkid', pluginUrl]);
+_gaq.push(['_setAccount', '{{ settings.GA_ACCOUNT_CODE }}']);
+_gaq.push(['_setDomainName', 'mozilla.org']);
 _gaq.push(['_setAllowLinker', true]);
 _gaq.push(['_setAllowAnchor', true]);
+_gaq.push(['_trackPageview']);
 
 {% if settings.GA_ACCOUNT_CODE %}
 (function() {
     var ga = document.createElement('script');
     ga.type = 'text/javascript';
     ga.async = true;
 
-    var prefix = ('https:' == document.location.protocol ? 'https://ssl' :
-                  'http://www');
+    var prefix = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www');
     ga.src = prefix + '.google-analytics.com/ga.js';
 
     var s = document.getElementsByTagName('script')[0];