Skip to content

Commit 042bb04

Browse files
markbiekmatticbot
markbiek
authored and
matticbot
committed
Importer: Show wpcom banner on free sites (#42693)
* Importer: Show wpcom banner * changelog * Remove uncessary loggers * changelog * Remove uncessary changelog * Adjust banner link * Remove any link change * Use original link * Importer: Fix guided import banner link (#42718) * Fix import/migrate banner link * changelog * Update link to use site-migration flow * Remove any link change * Update changelog * Redirect user to import-list * Add extra param to manage the import-or-migrate behaviour * Remove extra param Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/14180052720 Upstream-Ref: Automattic/jetpack@f122287
1 parent 51ea6d0 commit 042bb04

File tree

4 files changed

+67
-69
lines changed

4 files changed

+67
-69
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ function import_page_customizations_init() {
1515
$has_import_param = ! isset( $_GET['import'] );
1616

1717
if ( $screen && $screen->id === 'import' && $has_import_param ) {
18-
// Only add the banner if the user is using the wp-admin interface.
19-
if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
2018
add_action( 'admin_notices', 'import_admin_banner' );
2119
add_action( 'admin_enqueue_scripts', 'import_admin_banner_css' );
22-
}
2320
}
2421
}
22+
2523
add_action( 'current_screen', 'import_page_customizations_init' );
2624

2725
/**
@@ -37,7 +35,7 @@ function import_admin_banner() {
3735
return;
3836
}
3937

40-
$import_url = esc_url( "https://wordpress.com/setup/hosted-site-migration/site-migration-import-or-migrate?siteId={$blog_id}&ref=wp-admin" );
38+
$import_url = esc_url( "https://wordpress.com/setup/site-setup/importList?siteId={$blog_id}&ref=wp-admin-importers-list" );
4139

4240
$banner_content = sprintf(
4341
'<p>%s</p><a href="%s" class="button button-primary">%s</a>',

‎jetpack_vendor/i18n-map.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
),
5555
'jetpack-mu-wpcom' => array(
5656
'path' => 'jetpack_vendor/automattic/jetpack-mu-wpcom',
57-
'ver' => '6.2.0-alpha1743404690',
57+
'ver' => '6.2.0-alpha1743450257',
5858
),
5959
'jetpack-password-checker' => array(
6060
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

‎vendor/composer/installed.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"dist": {
8282
"type": "path",
8383
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
84-
"reference": "c030b32df057722eecfe182f4f168aa803070c78"
84+
"reference": "6fed2322fbc1fb89aa43ec07765430bf715c0381"
8585
},
8686
"require": {
8787
"php": ">=7.2"
@@ -138,7 +138,7 @@
138138
"dist": {
139139
"type": "path",
140140
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
141-
"reference": "2d1fa9713c0a15351fb0c131606200df00649854"
141+
"reference": "68693cf3169608ce84c402259582d226b697037e"
142142
},
143143
"require": {
144144
"php": ">=7.2"
@@ -201,7 +201,7 @@
201201
"dist": {
202202
"type": "path",
203203
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
204-
"reference": "df83a2404bf25d92f2b1747d30517f5ea4977603"
204+
"reference": "5245eba93d1aa88c2b8d5c4bb437de26bc11dfc0"
205205
},
206206
"require": {
207207
"automattic/jetpack-constants": "^3.0.6",
@@ -274,7 +274,7 @@
274274
"dist": {
275275
"type": "path",
276276
"url": "/tmp/jetpack-build/Automattic/jetpack-blaze",
277-
"reference": "e6b5d03c5a66bd4664b817af4457b23b89c0ecf9"
277+
"reference": "e34a59c964dab279e71b2adeb2d34d1c54a1683b"
278278
},
279279
"require": {
280280
"automattic/jetpack-assets": "^4.0.15",
@@ -353,7 +353,7 @@
353353
"dist": {
354354
"type": "path",
355355
"url": "/tmp/jetpack-build/Automattic/jetpack-blocks",
356-
"reference": "d6b576504903afd7f2ebfc0c27f87978a2830bca"
356+
"reference": "e1cf6d82e44f94a4922f074dd16b0da46b7a1e42"
357357
},
358358
"require": {
359359
"automattic/jetpack-constants": "^3.0.6",
@@ -413,7 +413,7 @@
413413
"dist": {
414414
"type": "path",
415415
"url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify",
416-
"reference": "4eda8058c33d9f4d95bacc6f8c51a946141d183a"
416+
"reference": "d2e385b4349d34c6c50545adcbef8a0ff243a9e7"
417417
},
418418
"require": {
419419
"automattic/jetpack-assets": "^4.0.15",
@@ -482,7 +482,7 @@
482482
"dist": {
483483
"type": "path",
484484
"url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper",
485-
"reference": "a9ffd365ecbe3ff1873a0bf35d3482dedae99348"
485+
"reference": "59be969f3a57344e7db665b2b1cd3267982fb45a"
486486
},
487487
"require": {
488488
"automattic/jetpack-assets": "^4.0.15",
@@ -550,7 +550,7 @@
550550
"dist": {
551551
"type": "path",
552552
"url": "/tmp/jetpack-build/Automattic/jetpack-compat",
553-
"reference": "9f2f2f715b029a1657e437f4314308f184159316"
553+
"reference": "56fb0f680717667e8479db6c259b4371c2ddb8ce"
554554
},
555555
"require": {
556556
"php": ">=7.2"
@@ -590,7 +590,7 @@
590590
"dist": {
591591
"type": "path",
592592
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
593-
"reference": "196fdca2fc358680d26642e26d397604eb3d4ef8"
593+
"reference": "c9525d6ea56a537aadb375f8c8035bdd4d642c57"
594594
},
595595
"require": {
596596
"composer-plugin-api": "^2.2",
@@ -654,7 +654,7 @@
654654
"dist": {
655655
"type": "path",
656656
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
657-
"reference": "02fdb72d746cd489e3a205daaae1d806fbabbe94"
657+
"reference": "594e3e2f3a59c4de4745822caeeb4d27aafd81bc"
658658
},
659659
"require": {
660660
"php": ">=7.2"
@@ -731,7 +731,7 @@
731731
"dist": {
732732
"type": "path",
733733
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
734-
"reference": "6df9c8121e6de6430898d543e892e97533faa44c"
734+
"reference": "7628c661925fa8693a7c95a04f7de8bc49cf8108"
735735
},
736736
"require": {
737737
"automattic/jetpack-a8c-mc-stats": "^3.0.4",
@@ -819,7 +819,7 @@
819819
"dist": {
820820
"type": "path",
821821
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
822-
"reference": "7135807d5d83968953ab3b647d724a289963f91e"
822+
"reference": "650b1b61b016e8bb3532d692a0f4743af309bc8f"
823823
},
824824
"require": {
825825
"php": ">=7.2"
@@ -877,7 +877,7 @@
877877
"dist": {
878878
"type": "path",
879879
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
880-
"reference": "b52cd83dbb8fd38513e90ae593f5032f216c65a3"
880+
"reference": "7d4f329a8ca25a1a62c0b54bbef6134e3ba3f9fe"
881881
},
882882
"require": {
883883
"php": ">=7.2"
@@ -934,7 +934,7 @@
934934
"dist": {
935935
"type": "path",
936936
"url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics",
937-
"reference": "cecd3b034430457a6960b2c45210a520250b28ff"
937+
"reference": "dafae95c28203ab54011bf516a3722e69ed6b5d1"
938938
},
939939
"require": {
940940
"automattic/jetpack-status": "^5.1.1",
@@ -1003,7 +1003,7 @@
10031003
"dist": {
10041004
"type": "path",
10051005
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
1006-
"reference": "2d38f43ccd3fcb1b43cbaa763c7293d03a61cf88"
1006+
"reference": "a00b2fc2b10cfe461e2f404bfe92ffe45be04b31"
10071007
},
10081008
"require": {
10091009
"php": ">=7.2"
@@ -1065,7 +1065,7 @@
10651065
"dist": {
10661066
"type": "path",
10671067
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
1068-
"reference": "6b378d44ccba8e794746f324971ee5e75f10d0e9"
1068+
"reference": "76aa95c2d82db75b726d1c7da50888fd242ee5d8"
10691069
},
10701070
"require": {
10711071
"automattic/jetpack-a8c-mc-stats": "^3.0.4",
@@ -1144,7 +1144,7 @@
11441144
"dist": {
11451145
"type": "path",
11461146
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1147-
"reference": "84fda2b611cedbeaf16e155958c055c4a9fb0731"
1147+
"reference": "a66abc68e9d980acdee5aef5405b17c07e3ba0de"
11481148
},
11491149
"require": {
11501150
"php": ">=7.2"
@@ -1201,7 +1201,7 @@
12011201
"dist": {
12021202
"type": "path",
12031203
"url": "/tmp/jetpack-build/Automattic/jetpack-masterbar",
1204-
"reference": "6b0182662e762419e119d20489b95c72b53402a7"
1204+
"reference": "383472e5e77e3b6614268bc09eae8729a6b5c696"
12051205
},
12061206
"require": {
12071207
"automattic/jetpack-assets": "^4.0.15",
@@ -1282,12 +1282,12 @@
12821282
},
12831283
{
12841284
"name": "automattic/jetpack-mu-wpcom",
1285-
"version": "6.2.0-alpha.1743404690",
1286-
"version_normalized": "6.2.0.0-alpha1743404690",
1285+
"version": "6.2.0-alpha.1743450257",
1286+
"version_normalized": "6.2.0.0-alpha1743450257",
12871287
"dist": {
12881288
"type": "path",
12891289
"url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
1290-
"reference": "5f1b8f37e28f3c66af0e34305564f24ed7f90048"
1290+
"reference": "fc1d2bd2accdae298c73c4a16bef44f244a25d42"
12911291
},
12921292
"require": {
12931293
"automattic/jetpack-assets": "^4.0.15",
@@ -1374,7 +1374,7 @@
13741374
"dist": {
13751375
"type": "path",
13761376
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1377-
"reference": "c6534c804889e2aface3c6db2133965af82fe7a3"
1377+
"reference": "e26632dc9dab5569e328e6e4a6680039d50f6a78"
13781378
},
13791379
"require": {
13801380
"php": ">=7.2"
@@ -1433,7 +1433,7 @@
14331433
"dist": {
14341434
"type": "path",
14351435
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1436-
"reference": "678844532432949d2668ef3ea12a8328958592bb"
1436+
"reference": "f83b93730cbfc0b638145067dfe2e76b9e765785"
14371437
},
14381438
"require": {
14391439
"automattic/jetpack-connection": "^6.10.0",
@@ -1499,7 +1499,7 @@
14991499
"dist": {
15001500
"type": "path",
15011501
"url": "/tmp/jetpack-build/Automattic/jetpack-post-list",
1502-
"reference": "e6291664b40ab338b738abee0fd67077b03b94d5"
1502+
"reference": "7fe829d674f1d69734905ebe61c5d87242384229"
15031503
},
15041504
"require": {
15051505
"automattic/jetpack-assets": "^4.0.15",
@@ -1568,7 +1568,7 @@
15681568
"dist": {
15691569
"type": "path",
15701570
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1571-
"reference": "a86107606ca123907cc390481a60302c96d88341"
1571+
"reference": "a8046fcfd17ba3534d26f6dd401b3890ecd64a92"
15721572
},
15731573
"require": {
15741574
"automattic/jetpack-status": "^5.1.1",
@@ -1627,7 +1627,7 @@
16271627
"dist": {
16281628
"type": "path",
16291629
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1630-
"reference": "5877fe011e6f611468fabf95f79844a48408120f"
1630+
"reference": "4eff12eb45d5704e784d5cc4e4bea7f01ab51fde"
16311631
},
16321632
"require": {
16331633
"php": ">=7.2"
@@ -1685,7 +1685,7 @@
16851685
"dist": {
16861686
"type": "path",
16871687
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
1688-
"reference": "8e0ea714f7b9b2d7946fb05afa449fde6d63c517"
1688+
"reference": "5db124aa6f383a4425169c61ae5b8ddc45764ee9"
16891689
},
16901690
"require": {
16911691
"automattic/jetpack-connection": "^6.10.0",
@@ -1755,7 +1755,7 @@
17551755
"dist": {
17561756
"type": "path",
17571757
"url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin",
1758-
"reference": "e658f0f61b5c75f2e3a2509dd9e3b42914aeb988"
1758+
"reference": "236084c3a69ce3a2e26aeaf30e08bd2df01fc40c"
17591759
},
17601760
"require": {
17611761
"automattic/jetpack-connection": "^6.10.0",
@@ -1826,7 +1826,7 @@
18261826
"dist": {
18271827
"type": "path",
18281828
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1829-
"reference": "d3ef7bd75cdf66489ada24d503bbdd84568b8830"
1829+
"reference": "cc44c5288242c458ae044f0d25718fb93a31dbf2"
18301830
},
18311831
"require": {
18321832
"automattic/jetpack-constants": "^3.0.6",
@@ -1894,7 +1894,7 @@
18941894
"dist": {
18951895
"type": "path",
18961896
"url": "/tmp/jetpack-build/Automattic/jetpack-subscribers-dashboard",
1897-
"reference": "8ead55c786e0f3bfa4c0f186d715f6b594d93830"
1897+
"reference": "a92e0846c1b5d995035fc2a85db8158a00b5aab2"
18981898
},
18991899
"require": {
19001900
"automattic/jetpack-connection": "^6.10.0",
@@ -1976,7 +1976,7 @@
19761976
"dist": {
19771977
"type": "path",
19781978
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1979-
"reference": "f3fdfb7563b2114c31287fb7ec2fee118eaa56b8"
1979+
"reference": "7455efabec259fc82678d56ff2ebb4c174fff39d"
19801980
},
19811981
"require": {
19821982
"automattic/jetpack-connection": "^6.10.0",
@@ -2052,7 +2052,7 @@
20522052
"dist": {
20532053
"type": "path",
20542054
"url": "/tmp/jetpack-build/Automattic/scheduled-updates",
2055-
"reference": "e3c620367e7f668f3eece7080c3c333e08c2e1c1"
2055+
"reference": "edbc769284005975125c5bc1525d10add005134d"
20562056
},
20572057
"require": {
20582058
"automattic/jetpack-connection": "^6.10.0",

0 commit comments

Comments
 (0)