Skip to content

Commit 058f180

Browse files
valterlorranmatticbot
authored andcommitted
The import banner should not be visible when running it (#42621)
Co-authored-by: Valter Lorran <[email protected]> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13978402995 Upstream-Ref: Automattic/jetpack@9b6b9eb
1 parent 6c8d728 commit 058f180

File tree

6 files changed

+98
-94
lines changed

6 files changed

+98
-94
lines changed

composer.lock

+32-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jetpack_vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ This is an alpha version! The changes listed here are not final.
7373
- Coming Soon: Add more checks to the ETK version comparison.
7474
- Disabled assigning and caching the global styles on personal experiment variation until we set up a new experiment
7575
- External Media: Move the external media import page to jetpack-external-media
76+
- Hides the Import banner when actually running the import tool.
7677
- Hide suggested tags on p2
7778
- Hide verify email launchpad task for "existing users"
7879
- Improve the import page by fixing the position of the Notice component and adding a color to it to not look disabled.

jetpack_vendor/automattic/jetpack-mu-wpcom/src/features/import-customizations/import-customizations.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
function import_page_customizations_init() {
1212
$screen = get_current_screen();
1313

14-
if ( $screen && $screen->id === 'import' ) {
14+
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- no changes made to the site.
15+
$has_import_param = ! isset( $_GET['import'] );
16+
17+
if ( $screen && $screen->id === 'import' && $has_import_param ) {
1518
// Only add the banner if the user is using the wp-admin interface.
1619
if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
1720
add_action( 'admin_notices', 'import_admin_banner' );

jetpack_vendor/i18n-map.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
),
5151
'jetpack-mu-wpcom' => array(
5252
'path' => 'jetpack_vendor/automattic/jetpack-mu-wpcom',
53-
'ver' => '6.2.0-alpha1742436344',
53+
'ver' => '6.2.0-alpha1742501300',
5454
),
5555
'jetpack-password-checker' => array(
5656
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

0 commit comments

Comments
 (0)