Ticket #255: googleanalyticsupdate.diff

templates/footer.tt

@@ -46 +46 @@
 </div>
 
   [% IF config.google_analytics_key %]
-    <script src="http://www.google-analytics.com/urchin.js"
-     type="text/javascript">
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
     </script>
+
     <script type="text/javascript">
-      _uacct = "[% CGI.escapeHTML( config.google_analytics_key  ) %]";
-      if ( typeof urchinTracker == 'function' ) urchinTracker();
+    var pageTracker = _gat._getTracker("[% CGI.escapeHTML( config.google_analytics_key  ) %]");
+    pageTracker._trackPageview();
     </script>
   [% END %]
 

t/48_google_analytics.t

@@ -34 +34 @@
                                 id => "Red Lion",
                                 return_output => 1,
                               );
-unlike( $output, qr/urchinTracker/, "Google analytics omitted by default" );
+unlike( $output, qr/ga.js/, "Google analytics omitted by default" );
 
 $config->google_analytics_key( "" );
 $output = $guide->display_node(
                                 id => "Red Lion",
                                 return_output => 1,
                               );
-unlike( $output, qr/urchinTracker/, "...also if analytics key is blank" );
+unlike( $output, qr/ga.js/, "...also if analytics key is blank" );
 
 $config->google_analytics_key( 0 );
 $output = $guide->display_node(
                                 id => "Red Lion",
                                 return_output => 1,
                               );
-unlike( $output, qr/urchinTracker/, "...also if analytics key is zero" );
+unlike( $output, qr/ga.js/, "...also if analytics key is zero" );
 
 $config->google_analytics_key( "ThisIsNotAKey" );
 $output = $guide->display_node(
                                 id => "Red Lion",
                                 return_output => 1,
                               );
-like( $output, qr/urchinTracker/, "does show up if key is provided" );
+like( $output, qr/ga.js/, "does show up if key is provided" );
 like( $output, qr/ThisIsNotAKey/, "...correct key" );