From 234d9e05a5b44de59b1705452f9e3f80e5903f59 Mon Sep 17 00:00:00 2001 From: Marcin Bot Date: Thu, 26 Oct 2017 13:40:54 +0100 Subject: [PATCH] Fixed the jetpack redirect url for sites in subdirectories (#17312) * Fixed the jetpack redirect url for sites in subdirectories * Using admin_url instead of get_admin_url for consistency * Wrapped the generated url in esc_url_raw --- includes/admin/class-wc-admin-setup-wizard.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php index 10c49a1e597..e59daadd7ae 100644 --- a/includes/admin/class-wc-admin-setup-wizard.php +++ b/includes/admin/class-wc-admin-setup-wizard.php @@ -1582,10 +1582,12 @@ class WC_Admin_Setup_Wizard { exit; } - $redirect_url = site_url( add_query_arg( array( + $redirect_url = esc_url_raw( add_query_arg( array( + 'page' => 'wc-setup', + 'step' => 'activate', 'from' => 'wpcom', 'activate_error' => false, - ) ) ); + ), admin_url() ) ); $connection_url = Jetpack::init()->build_connect_url( true, $redirect_url, 'woocommerce-setup-wizard' ); wp_redirect( esc_url_raw( $connection_url ) );