Improved wc_get_current_admin_url()

- Replace "/wp-admin" with regex like on WP core. - Remove "wc-hide-notice" from query args.
ajeets1978 · Jul 30, 2020 · a464b7a · a464b7a
1 parent c9f52a4
commit a464b7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php
@@ -486,11 +486,11 @@ function wc_render_invalid_variation_notice( $product_object ) {
  */
 function wc_get_current_admin_url() {
 	$uri = isset( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
-	$uri = str_replace( '/wp-admin', '', $uri );
+	$uri = preg_replace( '|^.*/wp-admin/|i', '', $uri );
 
 	if ( ! $uri ) {
 		return '';
 	}
 
-	return remove_query_arg( array( '_wpnonce', '_wc_notice_nonce', 'wc_db_update', 'wc_db_update_nonce' ), admin_url( $uri ) );
+	return remove_query_arg( array( '_wpnonce', '_wc_notice_nonce', 'wc_db_update', 'wc_db_update_nonce', 'wc-hide-notice' ), admin_url( $uri ) );
 }