Google Analytics for WordPress by MonsterInsights - Version 4.2.7

Version Description

  • Fix to prevent far too agressive oAuth implementation from breaking other plugins.
Download this release

Release Info

Developer joostdevalk
Plugin Icon 128x128 Google Analytics for WordPress by MonsterInsights
Version 4.2.7
Comparing to
See all releases

Code changes from version 4.2.6 to 4.2.7

Files changed (7) hide show
  1. googleanalytics.php +18 -6
  2. readme.txt +2 -2
  3. screenshot-1.png +0 -0
  4. screenshot-2.png +0 -0
  5. screenshot-3.png +0 -0
  6. screenshot-4.png +0 -0
  7. screenshot-5.png +0 -0
googleanalytics.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Google Analytics for WordPress
4
  Plugin URI: http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v420
5
  Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. custom variables and automatic clickout and download tracking.
6
  Author: Joost de Valk
7
- Version: 4.2.6
8
  Requires at least: 3.0
9
  Author URI: http://yoast.com/
10
  License: GPL v3
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28
 
29
  // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics
30
 
31
- define( 'GAWP_VERSION', '4.2.5' );
32
 
33
  /*
34
  * Admin User Interface
@@ -907,8 +907,8 @@ if ( is_admin() && ( !defined( 'DOING_AJAX' ) || !DOING_AJAX ) && !class_exists(
907
  )
908
  );
909
 
910
- $oauth_callback = add_query_arg( array( 'ga_oauth_callback' => 1 ), menu_page_url( 'google-analytics-for-wordpress', false ) );
911
- $request_token = $gdata->get_request_token( $oauth_callback );
912
 
913
  $options = get_option( $this->optionname );
914
  unset( $options['ga_token'] );
@@ -1183,7 +1183,11 @@ if ( !class_exists( 'GA_Filter' ) ) {
1183
  else
1184
  preg_match( $domainPatternUS, $host, $matches );
1185
 
1186
- return array( "domain"=> $matches[0], "host"=> $host );
 
 
 
 
1187
  }
1188
 
1189
  function ga_parse_link( $category, $matches ) {
@@ -1570,11 +1574,13 @@ function yoast_analytics() {
1570
  echo '<!-- Please set Google Analytics position to "manual" in the settings, or remove this call to yoast_analytics(); -->';
1571
  }
1572
 
1573
- $gaf = new GA_Filter();
1574
 
1575
  if ( !is_array( $options ) ) {
1576
  $options = get_option( 'GoogleAnalyticsPP' );
1577
  if ( !is_array( $options ) ) {
 
 
1578
  $ga_admin->set_defaults();
1579
  } else {
1580
  delete_option( 'GoogleAnalyticsPP' );
@@ -1587,6 +1593,12 @@ if ( !is_array( $options ) ) {
1587
  update_option( 'Yoast_Google_Analytics', $options );
1588
  }
1589
  } else {
 
 
 
 
 
 
1590
  if ( isset( $options['allowanchor'] ) && $options['allowanchor'] ) {
1591
  add_action( 'init', 'ga_utm_hashtag_redirect', 1 );
1592
  }
4
  Plugin URI: http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v420
5
  Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. custom variables and automatic clickout and download tracking.
6
  Author: Joost de Valk
7
+ Version: 4.2.7
8
  Requires at least: 3.0
9
  Author URI: http://yoast.com/
10
  License: GPL v3
28
 
29
  // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics
30
 
31
+ define( 'GAWP_VERSION', '4.2.7' );
32
 
33
  /*
34
  * Admin User Interface
907
  )
908
  );
909
 
910
+ $oauth_callback = add_query_arg( array( 'ga_oauth_callback' => 1 ), menu_page_url( 'google-analytics-for-wordpress', false ) );
911
+ $request_token = $gdata->get_request_token( $oauth_callback );
912
 
913
  $options = get_option( $this->optionname );
914
  unset( $options['ga_token'] );
1183
  else
1184
  preg_match( $domainPatternUS, $host, $matches );
1185
 
1186
+ if ( isset($matches[0]) ) {
1187
+ return array( "domain"=> $matches[0], "host"=> $host );
1188
+ } else {
1189
+ return false;
1190
+ }
1191
  }
1192
 
1193
  function ga_parse_link( $category, $matches ) {
1574
  echo '<!-- Please set Google Analytics position to "manual" in the settings, or remove this call to yoast_analytics(); -->';
1575
  }
1576
 
1577
+ $options = get_option( 'Yoast_Google_Analytics' );
1578
 
1579
  if ( !is_array( $options ) ) {
1580
  $options = get_option( 'GoogleAnalyticsPP' );
1581
  if ( !is_array( $options ) ) {
1582
+ if ( !isset( $ga_admin ) )
1583
+ $ga_admin = new GA_Admin();
1584
  $ga_admin->set_defaults();
1585
  } else {
1586
  delete_option( 'GoogleAnalyticsPP' );
1593
  update_option( 'Yoast_Google_Analytics', $options );
1594
  }
1595
  } else {
1596
+
1597
+ if ( !isset( $options['uastring'] ) || $options['uastring'] == '' )
1598
+ return;
1599
+
1600
+ $gaf = new GA_Filter();
1601
+
1602
  if ( isset( $options['allowanchor'] ) && $options['allowanchor'] ) {
1603
  add_action( 'init', 'ga_utm_hashtag_redirect', 1 );
1604
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://yoast.com/donate/
4
  Tags: analytics, google analytics, statistics, tracking, stats, google
5
  Requires at least: 2.8
6
  Tested up to: 3.4
7
- Stable tag: 4.2.6
8
 
9
  Track your WordPress site easily and with lots of metadata: views per author & category, automatic tracking of outbound clicks and pageviews.
10
 
@@ -58,7 +58,7 @@ This section describes how to install the plugin and get it working.
58
 
59
  == Changelog ==
60
 
61
- = 4.2.6 =
62
 
63
  * Fix to prevent far too agressive oAuth implementation from breaking other plugins.
64
 
4
  Tags: analytics, google analytics, statistics, tracking, stats, google
5
  Requires at least: 2.8
6
  Tested up to: 3.4
7
+ Stable tag: 4.2.7
8
 
9
  Track your WordPress site easily and with lots of metadata: views per author & category, automatic tracking of outbound clicks and pageviews.
10
 
58
 
59
  == Changelog ==
60
 
61
+ = 4.2.7 =
62
 
63
  * Fix to prevent far too agressive oAuth implementation from breaking other plugins.
64
 
screenshot-1.png DELETED
Binary file
screenshot-2.png DELETED
Binary file
screenshot-3.png DELETED
Binary file
screenshot-4.png DELETED
Binary file
screenshot-5.png DELETED
Binary file