Merge pull request #261 from plausible/default_enhanced_measurements

Added: Enhanced Measurements 404, File downloads, Outbound links, Form completions and Search queries are now enabled by default.

Author: Dan0sz

src/Admin/Settings/API.php

@@ -89,7 +89,7 @@ public function settings_page() {
 					'Would you like to view your site\'s stats in your WordPress dashboard?',
 					'plausible-analytics'
 				),
-				'enhanced_measurements'      => __( 'Enable enhanced measurements', 'plausible-analytics' ),
+				'enhanced_measurements'      => __( 'Enable enhanced measurements.', 'plausible-analytics' ),
 				'proxy_enabled'              => __(
 					'Run our script as a first party connection from your domain name to count visitors who use ad blockers',
 					'plausible-analytics'

src/Admin/Upgrades.php

@@ -60,10 +60,6 @@ public function run() {
 			$this->upgrade_to_126();
 		}
 
-		if ( version_compare( $plausible_analytics_version, '1.3.1', '<' ) ) {
-			$this->upgrade_to_131();
-		}
-
 		if ( version_compare( $plausible_analytics_version, '1.3.2', '<' ) ) {
 			$this->upgrade_to_132();
 		}
@@ -116,9 +112,6 @@ public function upgrade_to_125() {
 			unset( $new_settings[ 'is_custom_domain' ] );
 		}
 
-		// Enable Outbound links by default.
-		$new_settings[ 'enhanced_measurements' ] = [ 'outbound-links' ];
-
 		if ( ! empty( $old_settings[ 'track_administrator' ] ) && $old_settings[ 'track_administrator' ] === 'true' ) {
 			$new_settings[ 'tracked_user_roles' ] = [ 'administrator' ];
 		}
@@ -148,25 +141,6 @@ public function upgrade_to_126() {
 		update_option( 'plausible_analytics_version', '1.2.6' );
 	}
 
-	/**
-	 * Upgrade to 1.3.1
-	 * - Enables 404 pages tracking by default.
-	 *
-	 * @return void
-	 * @codeCoverageIgnore
-	 */
-	public function upgrade_to_131() {
-		$settings = Helpers::get_settings();
-
-		if ( ! in_array( '404', $settings[ 'enhanced_measurements' ], true ) ) {
-			array_unshift( $settings[ 'enhanced_measurements' ], '404' );
-		}
-
-		update_option( 'plausible_analytics_settings', $settings );
-
-		update_option( 'plausible_analytics_version', '1.3.1' );
-	}
-
 	/**
 	 * Upgrade to 1.3.2
 	 * - Updates the Proxy Resource, Cache URL to be protocol relative.

src/Helpers.php

@@ -92,7 +92,7 @@ public static function get_settings() {
 		$defaults = [
 			'domain_name'                => '',
 			'api_token'                  => '',
-			'enhanced_measurements'      => [],
+			'enhanced_measurements'      => [ '404', 'file-downloads', 'form-completions', 'search', 'outbound-links' ],
 			'affiliate-links'            => [],
 			'proxy_enabled'              => '',
 			'enable_analytics_dashboard' => '',