From c5f097f3197b9808565194ac61ccc65e292c5913 Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Mon, 9 Oct 2017 08:55:30 -0600 Subject: [PATCH] Setup wizard: check for activate-step-specific GET parameters before hiding the step. This was a bit overzealous, and broke successful connection flows from the wizard. (Introduced in 97faa49fc4596a41cfe09d0d18599c0298ec5df5) --- includes/admin/class-wc-admin-setup-wizard.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php index ea4958ba0d3..b1a737341a4 100644 --- a/includes/admin/class-wc-admin-setup-wizard.php +++ b/includes/admin/class-wc-admin-setup-wizard.php @@ -132,8 +132,14 @@ class WC_Admin_Setup_Wizard { unset( $default_steps['shipping'] ); } - // Hide the activate step if Jetpack is already active. - if ( class_exists( 'Jetpack' ) && Jetpack::is_active() ) { + // Hide the activate step if Jetpack is already active, but not + // if we're returning from connecting Jetpack on WordPress.com. + if ( + class_exists( 'Jetpack' ) && + Jetpack::is_active() && + ! isset( $_GET['from'] ) && + ! isset( $_GET['activate_error'] ) + ) { unset( $default_steps['activate'] ); }