Merge branch 'trunk' into enhance/wordpress-branding

bootstrap.php

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

includes/Data/Patterns.php

@@ -220,7 +220,7 @@ public static function get_pattern_from_slug( $pattern_slug ) {
 	 */
 	private static function replace_header_menu_slug( $patterns, $header_menu_slug ) {
 		foreach ( $patterns as $slug => $slug_details ) {
-			if ( true === $slug_details['replace'] ) {
+			if ( isset( $slug_details['replace'] ) && true === $slug_details['replace'] ) {
 				unset( $patterns[ $slug ] );
 				$patterns = array_merge( array( $header_menu_slug => $slug_details ), $patterns );
 			}

includes/RestApi/RestApiFilter.php

@@ -3,6 +3,7 @@
 namespace NewfoldLabs\WP\Module\Onboarding\RestApi;
 
 use NewfoldLabs\WP\Module\Onboarding\Data\Patterns;
+use NewfoldLabs\WP\Module\Onboarding\WP_Admin;
 
 /**
  * Instantiate controllers and register routes.
@@ -131,7 +132,11 @@ public static function header_menu_rename_pages( $response, array $handler, \WP_
 	 * @return boolean
 	 */
 	public static function is_request_from_onboarding_flow( \WP_REST_Request $request ) {
-		return false !== stripos( $request->get_header( 'referer' ), 'page=nfd-onboarding' );
+		$referrer = $request->get_header( 'referer' );
+		if ( ! $referrer ) {
+			return false;
+		}
+		return false !== stripos( $referrer, 'page=' . WP_Admin::$slug );
 	}
 
 	/**

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@newfold-labs/wp-module-onboarding",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "description": "Next-generation WordPress Onboarding for WordPress sites at Newfold Digital.",
     "license": "GPL-2.0-or-later",
     "private": true,