Changeset 1204

Timestamp:

Aug 8, 2008, 11:42:57 AM (9 years ago)

Author:

Dominic Hargreaves

Message:

Fix Google Analytics by not trying to escape the key

Location:

trunk

Files:

• Changes (modified) (1 diff)
• t/48_google_analytics.t (modified) (2 diffs)
• templates/footer.tt (modified) (1 diff)

trunk/Changes

@@ -23 +23 @@
         Update references to http://openguides.org moved URLs
         Update Google Analytics code to support new version (#255)
+        Some pages didn't properly include Google Analyatics; fix this (#257)
 
 0.62    8 June 2008

trunk/t/48_google_analytics.t

@@ -11 +11 @@
 }
 
-plan tests => 5;
+plan tests => 9;
 
 my ( $config, $guide, $wiki, $cookie, $output );
@@ -58 +58 @@
 like( $output, qr/ga.js/, "does show up if key is provided" );
 like( $output, qr/ThisIsNotAKey/, "...correct key" );
+# Make sure analytics stuff only shows up if we want it to on recent changes
+# recent changes doesnt use CGI. which we dont need anymore but we should test in case we change our mind again.
+
+$config->google_analytics_key( "" );
+$output = $guide->display_recent_changes( return_output => 1 );
+unlike( $output, qr/ga.js/, "...also if analytics key is blank" );
+
+$config->google_analytics_key( 0 );
+$output = $guide->display_recent_changes( return_output => 1 );
+unlike( $output, qr/ga.js/, "...also if analytics key is zero" );
+
+$config->google_analytics_key( "ThisIsNotAKey" );
+$output = $guide->display_recent_changes( return_output => 1 );
+like( $output, qr/ga.js/, "does show up if key is provided" );
+like( $output, qr/ThisIsNotAKey/, "...correct key" );

trunk/templates/footer.tt

@@ -53 +53 @@
 
     <script type="text/javascript">
-    var pageTracker = _gat._getTracker("[% CGI.escapeHTML( config.google_analytics_key  ) %]");
+    var pageTracker = _gat._getTracker("[% config.google_analytics_key %]");
     pageTracker._trackPageview();
     </script>