Merge branch 'trunk' of https://github.com/newfold-labs/wp-module-onb…

…oarding into update/node

bootstrap.php

@@ -24,7 +24,7 @@ function nfd_wp_module_onboarding_register() {
 
 				// Set Global Constants
 				if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) {
-					define( 'NFD_ONBOARDING_VERSION', '2.1.0' );
+					define( 'NFD_ONBOARDING_VERSION', '2.1.1' );
 				}
 				if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) {
 					define( 'NFD_ONBOARDING_DIR', __DIR__ );

composer.json

@@ -37,7 +37,8 @@
 		"newfold-labs/wp-module-onboarding-data": "^1.1.0",
 		"newfold-labs/wp-module-patterns": "^0.1.14",
 		"newfold-labs/wp-module-install-checker": "^1.0",
-		"newfold-labs/wp-module-facebook": "^1.0.6"
+		"newfold-labs/wp-module-facebook": "^1.0.6",
+		"wp-forge/helpers": "^2.0"
 	},
 	"require-dev": {
 		"wp-phpunit/wp-phpunit": "^6.2",

includes/LoginRedirect.php

@@ -3,7 +3,9 @@
 
 use NewfoldLabs\WP\Module\Onboarding\Data\Data;
 use NewfoldLabs\WP\Module\Onboarding\Data\Options;
+
 use function NewfoldLabs\WP\ModuleLoader\container;
+use function WP_Forge\Helpers\dataGet;
 
 /**
  * Contains functionalities that redirect users to onboarding upon logging into WordPress.
@@ -65,7 +67,7 @@ public static function filter_redirect( $original_redirect, $user ) {
 
 		// Don't redirect to onboarding if onboarding was exited or completed.
 		$flow_data = get_option( Options::get_option_name( 'flow' ), false );
-		if ( data_get( $flow_data, 'hasExited' ) || data_get( $flow_data, 'isComplete' ) ) {
+		if ( dataGet( $flow_data, 'hasExited' ) || dataGet( $flow_data, 'isComplete' ) ) {
 			return $original_redirect;
 		}