Merge pull request #401 from Yoast/5.4.3

Version bump and release notes 5.4.3

admin/class-admin.php

@@ -78,7 +78,7 @@ public function init_settings() {
 	 * There is an error with the API libs. So show a notice.
 	 */
 	public function set_api_libs_error() {
-		echo '<div class="error"><p>' . __( 'We\'ve detected some possible incompatibility issues. Be sure all our plugins are up to date.', 'google-analytics-for-wordpress' ) . '</p></div>';
+		echo '<div class="error notice"><p>' . __( 'Yoast plugins share some code between them to make your site faster. As a result of that, we need all Yoast plugins to be up to date. We\'ve detected this isn\'t the case, so please update the Yoast plugins that aren\'t up to date yet.', 'google-analytics-for-wordpress' ) . '</p></div>';
 	}
 
 	/**

composer.json

@@ -24,7 +24,7 @@
 		"composer/installers": "~1.0",
 		"yoast/license-manager": "^1.2",
 		"yoast/i18n-module": "^1.0",
-		"yoast/api-libs": "dev-master",
+		"yoast/api-libs": "^2.0",
 		"xrstf/composer-php52": "^1.0.17"
 	},
 	"require-dev": {

googleanalytics.php

@@ -9,7 +9,7 @@
  * Plugin URI: https://yoast.com/wordpress/plugins/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v504
  * Description: This plugin makes it simple to add Google Analytics to your WordPress site, adding lots of features, e.g. error page, search result and automatic outgoing links and download tracking.
  * Author: Team Yoast
- * Version: 5.4.2
+ * Version: 5.4.3
  * Requires at least: 3.8
  * Author URI: https://yoast.com/
  * License: GPL v3
@@ -35,7 +35,7 @@
 
 // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics, but has since been rewritten and refactored multiple times.
 
-define( 'GAWP_VERSION', '5.4.2' );
+define( 'GAWP_VERSION', '5.4.3' );
 
 define( 'GAWP_FILE', __FILE__ );
 

languages/google-analytics-for-wordpress.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the GPL v3.
 msgid ""
 msgstr ""
-"Project-Id-Version: Google Analytics by Yoast 5.4.2\n"
+"Project-Id-Version: Google Analytics by Yoast 5.4.3\n"
 "Report-Msgid-Bugs-To: "
 "https://github.com/yoast/google-analytics-for-wordpress/issues\n"
-"POT-Creation-Date: 2015-07-15 09:36:39+00:00\n"
+"POT-Creation-Date: 2015-07-15 13:53:50+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,8 +57,10 @@ msgstr ""
 
 #: admin/class-admin.php:81
 msgid ""
-"We've detected some possible incompatibility issues. Be sure all our "
-"plugins are up to date."
+"Yoast plugins share some code between them to make your site faster. As a "
+"result of that, we need all Yoast plugins to be up to date. We've detected "
+"this isn't the case, so please update the Yoast plugins that aren't up to "
+"date yet."
 msgstr ""
 
 #: admin/class-admin.php:118

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://yoast.com/donate/
 Tags: analytics, google analytics, statistics, tracking, stats, google, yoast
 Requires at least: 3.8
 Tested up to: 4.2
-Stable tag: 5.4.2
+Stable tag: 5.4.3
 License: GPL v3
 
 Track your WordPress site easily with the latest tracking codes and lots added data for search result pages and error pages.
@@ -51,6 +51,19 @@ This section describes how to install the plugin and get it working.
 
 == Changelog ==
 
+= 5.4.3 =
+
+Release Date: July 15th, 2015
+
+* Enhancements:
+    * Improved form labels for remarketing / demographics and interests reports.
+    * Improved the notice that is shown in the head to non-admin users when their usergroup has been excluded from tracking or debug mode is enabled.
+    * Adds 4 translations: ca, en_AU, ja, pt_PT
+
+* Bugfixes:
+    * Fixes a bug where the plugin would fetch a refresh token from Google on every page request.
+    * Fixes an undefined index notice which was triggered when running WordPress using WP CLI.
+
 = 5.4.2 =
 
 Release Date: April 21th, 2015

tests/dashboards/test-class-admin-dashboards.php

@@ -1,7 +1,7 @@
 <?php
 
 // Load dependencies from API-Libs
-require( dirname( __FILE__ ) . '/../../vendor/yoast/api-libs/google/class-api-google.php' );
+require( dirname( __FILE__ ) . '/../../vendor/yoast/api-libs/class-api-google.php' );
 
 class Yoast_GA_Dashboards_Test extends GA_UnitTestCase {