Skip to content

Commit 9324e94

Browse files
mmtrmatticbot
mmtr
authored and
matticbot
committed
Admin Menu: Show "Jetpack > Podcasting" menu on all sites (#44367)
- Display the Jetpack > Podcasting menu on all sites (previously only visible with the classic interface). - Deprecate the Settings > Podcasting menu for existing users with a callout informing that the menu has been moved (see Automattic/wp-calypso#104805). Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/16373409300 Upstream-Ref: Automattic/jetpack@3160d75
1 parent 6864f52 commit 9324e94

File tree

6 files changed

+176
-173
lines changed

6 files changed

+176
-173
lines changed

‎jetpack_vendor/automattic/jetpack-masterbar/src/admin-menu/class-admin-menu.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,11 @@ public function add_options_menu() {
388388

389389
// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
390390
add_submenu_page( 'options-general.php', esc_attr__( 'Newsletter', 'jetpack-masterbar' ), __( 'Newsletter', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/settings/newsletter/' . $this->domain, null, 7 );
391-
// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
392-
add_submenu_page( 'options-general.php', esc_attr__( 'Podcasting', 'jetpack-masterbar' ), __( 'Podcasting', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/settings/podcasting/' . $this->domain, null, 8 );
391+
// Temporary "Settings > Podcasting" menu for existing users that shows a callout informing that the screen has moved to "Jetpack > Podcasting".
392+
if ( get_current_user_id() < 268901000 ) {
393+
// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
394+
add_submenu_page( 'options-general.php', esc_attr__( 'Podcasting', 'jetpack-masterbar' ), __( 'Podcasting', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/settings/jetpack-podcasting/' . $this->domain, null, 8 );
395+
}
393396
}
394397

395398
/**

‎jetpack_vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,16 @@ function wpcom_add_jetpack_submenu() {
261261
$subscribers_dashboard->add_wp_admin_submenu();
262262
}
263263

264+
// Jetpack > Podcasting
265+
add_submenu_page(
266+
'jetpack',
267+
__( 'Podcasting', 'jetpack-mu-wpcom' ),
268+
__( 'Podcasting', 'jetpack-mu-wpcom' ),
269+
'manage_options',
270+
'https://wordpress.com/settings/podcasting/' . $domain,
271+
null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
272+
);
273+
264274
if ( $uses_wp_admin_interface ) {
265275
// Jetpack > Activity Log.
266276
wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', array( 'site' => $blog_id ) ) ) );
@@ -284,16 +294,6 @@ function wpcom_add_jetpack_submenu() {
284294
null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
285295
);
286296
}
287-
288-
// Jetpack > Podcasting
289-
add_submenu_page(
290-
'jetpack',
291-
__( 'Podcasting', 'jetpack-mu-wpcom' ),
292-
__( 'Podcasting', 'jetpack-mu-wpcom' ),
293-
'manage_options',
294-
'https://wordpress.com/settings/podcasting/' . $domain,
295-
null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
296-
);
297297
}
298298

299299
// Re-order menu.

‎jetpack_vendor/i18n-map.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
),
5151
'jetpack-masterbar' => array(
5252
'path' => 'jetpack_vendor/automattic/jetpack-masterbar',
53-
'ver' => '0.19.0-alpha1752760555',
53+
'ver' => '0.19.0-alpha1752849838',
5454
),
5555
'jetpack-mu-wpcom' => array(
5656
'path' => 'jetpack_vendor/automattic/jetpack-mu-wpcom',
57-
'ver' => '6.7.0-alpha1752848425',
57+
'ver' => '6.7.0-alpha1752849838',
5858
),
5959
'jetpack-password-checker' => array(
6060
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

‎vendor/composer/installed.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"dist": {
8585
"type": "path",
8686
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
87-
"reference": "d74d13607294b915c5d49225adfbe1abf4ff5db4"
87+
"reference": "14a8d6f11e031843f74c07fc8ce38eb87cbcaca5"
8888
},
8989
"require": {
9090
"php": ">=7.2"
@@ -141,7 +141,7 @@
141141
"dist": {
142142
"type": "path",
143143
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
144-
"reference": "8db3d98d95ee95dbeee3bfa40630912673dd04fb"
144+
"reference": "c13d11005c0874b026c290802ddef77395004322"
145145
},
146146
"require": {
147147
"php": ">=7.2"
@@ -204,7 +204,7 @@
204204
"dist": {
205205
"type": "path",
206206
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
207-
"reference": "e3ca02e1ffa6c9e82696c96271a86dde7aff882a"
207+
"reference": "f3edc469f3d7852bfb9c96feca47cce391043857"
208208
},
209209
"require": {
210210
"automattic/jetpack-constants": "^3.0.8",
@@ -278,7 +278,7 @@
278278
"dist": {
279279
"type": "path",
280280
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
281-
"reference": "2e9162d1316977ad77c6ed0569fbb9ac052835ee"
281+
"reference": "400a8f5b94e8f3eeee1a5e0c64c9d721dd6d324d"
282282
},
283283
"require": {
284284
"composer-plugin-api": "^2.2",
@@ -350,7 +350,7 @@
350350
"dist": {
351351
"type": "path",
352352
"url": "/tmp/jetpack-build/Automattic/jetpack-blaze",
353-
"reference": "8b6b635fcc9384c8948077e5e26b5c50d2b677f2"
353+
"reference": "6a09231a11863cac9508af7e7b32e740ca179ae0"
354354
},
355355
"require": {
356356
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -429,7 +429,7 @@
429429
"dist": {
430430
"type": "path",
431431
"url": "/tmp/jetpack-build/Automattic/jetpack-blocks",
432-
"reference": "97dc3a5efcddd9d1c7d7d9ffbbc08678fb857644"
432+
"reference": "8f1c540fe3131c4ca707b103f8c89b29b63db1ea"
433433
},
434434
"require": {
435435
"automattic/jetpack-constants": "^3.0.8",
@@ -489,7 +489,7 @@
489489
"dist": {
490490
"type": "path",
491491
"url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify",
492-
"reference": "88dd08bbba4155e27a28430fbafddcda2f2a1b52"
492+
"reference": "6864909c9d24b03557993880c53433442e52f491"
493493
},
494494
"require": {
495495
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -558,7 +558,7 @@
558558
"dist": {
559559
"type": "path",
560560
"url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper",
561-
"reference": "9bb42efe34f25b638964a2bf607e9610a15d98b8"
561+
"reference": "aba5fa2936871ef78fa1abb28390de86629fee1b"
562562
},
563563
"require": {
564564
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -626,7 +626,7 @@
626626
"dist": {
627627
"type": "path",
628628
"url": "/tmp/jetpack-build/Automattic/jetpack-compat",
629-
"reference": "45c920825b9fc74c192b84f2b8c2d5e7951aa0db"
629+
"reference": "79dbf989ca76fe728365d852d096bd1ce0eebf77"
630630
},
631631
"require": {
632632
"php": ">=7.2"
@@ -666,7 +666,7 @@
666666
"dist": {
667667
"type": "path",
668668
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
669-
"reference": "4fcd264214ee864df8030b9c985753df6ea65109"
669+
"reference": "2b98e73dfd7809dd1ce33cd53c5984f76f4bac1a"
670670
},
671671
"require": {
672672
"composer-plugin-api": "^2.2",
@@ -730,7 +730,7 @@
730730
"dist": {
731731
"type": "path",
732732
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
733-
"reference": "cba746bab4a0447d94ebd3569ee754e0d03c2031"
733+
"reference": "1a21c87a44ad41abd131041c211404b71cbd10e7"
734734
},
735735
"require": {
736736
"php": ">=7.2"
@@ -805,7 +805,7 @@
805805
"dist": {
806806
"type": "path",
807807
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
808-
"reference": "803c00a1940d0c5f2587d041a869ae53640a0123"
808+
"reference": "4648d593d72a6ed001325f5de49d5dc535442204"
809809
},
810810
"require": {
811811
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -893,7 +893,7 @@
893893
"dist": {
894894
"type": "path",
895895
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
896-
"reference": "2a4ee2d2225f1b9dc7a39b08ba4958e89023c470"
896+
"reference": "51fe96e8205018dcf50c867ca4d207095cf57bda"
897897
},
898898
"require": {
899899
"php": ">=7.2"
@@ -951,7 +951,7 @@
951951
"dist": {
952952
"type": "path",
953953
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
954-
"reference": "a3b0a3ee4c610c7035aa661924d232cd0a135c1b"
954+
"reference": "9b8f9c8c6d5880e17184f41c7932d46fc26c1fd0"
955955
},
956956
"require": {
957957
"php": ">=7.2"
@@ -1008,7 +1008,7 @@
10081008
"dist": {
10091009
"type": "path",
10101010
"url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics",
1011-
"reference": "e97f71d5c8c7d053b71def975d3f63843ee79b23"
1011+
"reference": "84c4aa858be40ff64f6a57c219e39245189eb303"
10121012
},
10131013
"require": {
10141014
"automattic/jetpack-status": "^5.4.1-alpha",
@@ -1077,7 +1077,7 @@
10771077
"dist": {
10781078
"type": "path",
10791079
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
1080-
"reference": "956bd0890b7c17f38ee08891c56e593f128c6dd0"
1080+
"reference": "dd8965b25db2fca83a260a6f4517630015e4fa05"
10811081
},
10821082
"require": {
10831083
"php": ">=7.2"
@@ -1139,7 +1139,7 @@
11391139
"dist": {
11401140
"type": "path",
11411141
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
1142-
"reference": "94d29c164608c7083c32e7f09b5a5291f5eba867"
1142+
"reference": "fec8202247e3cc73567cb6f7f764aa8e8e9a2fe9"
11431143
},
11441144
"require": {
11451145
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -1218,7 +1218,7 @@
12181218
"dist": {
12191219
"type": "path",
12201220
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1221-
"reference": "26a470aa3f926edc109580860cbcb25269521dd1"
1221+
"reference": "0279dea3baae44a82d5b115aeeec471e82d8fdd6"
12221222
},
12231223
"require": {
12241224
"php": ">=7.2"
@@ -1270,12 +1270,12 @@
12701270
},
12711271
{
12721272
"name": "automattic/jetpack-masterbar",
1273-
"version": "0.19.0-alpha.1752760555",
1274-
"version_normalized": "0.19.0.0-alpha1752760555",
1273+
"version": "0.19.0-alpha.1752849838",
1274+
"version_normalized": "0.19.0.0-alpha1752849838",
12751275
"dist": {
12761276
"type": "path",
12771277
"url": "/tmp/jetpack-build/Automattic/jetpack-masterbar",
1278-
"reference": "4f96038f8d038e480a6ea40e951767b46df46843"
1278+
"reference": "fdee3888c03cea2ae8039008b80af5690d80fc0f"
12791279
},
12801280
"require": {
12811281
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -1356,12 +1356,12 @@
13561356
},
13571357
{
13581358
"name": "automattic/jetpack-mu-wpcom",
1359-
"version": "6.7.0-alpha.1752848425",
1360-
"version_normalized": "6.7.0.0-alpha1752848425",
1359+
"version": "6.7.0-alpha.1752849838",
1360+
"version_normalized": "6.7.0.0-alpha1752849838",
13611361
"dist": {
13621362
"type": "path",
13631363
"url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
1364-
"reference": "909e4ace2f66873a720fdf18720dfaee4936f4c3"
1364+
"reference": "45aa44061a0f3d09ac970e151f793201722eaf6f"
13651365
},
13661366
"require": {
13671367
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -1448,7 +1448,7 @@
14481448
"dist": {
14491449
"type": "path",
14501450
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1451-
"reference": "02703f889e93bb55257f34e3a88b9202ea203362"
1451+
"reference": "d62883fc828cb08762acd15d07771d331d8cb1c8"
14521452
},
14531453
"require": {
14541454
"php": ">=7.2"
@@ -1507,7 +1507,7 @@
15071507
"dist": {
15081508
"type": "path",
15091509
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1510-
"reference": "2ec4901a16e9422ddd6d9c6d0b5ae92483e7810f"
1510+
"reference": "f1e257ee59a4ffa95047f54b79bad579c6fb8be8"
15111511
},
15121512
"require": {
15131513
"automattic/jetpack-connection": "^6.15.0-alpha",
@@ -1573,7 +1573,7 @@
15731573
"dist": {
15741574
"type": "path",
15751575
"url": "/tmp/jetpack-build/Automattic/jetpack-post-list",
1576-
"reference": "cb9f1bea74ba2ea14ccfed72f8364b9ba4b3f1a1"
1576+
"reference": "1a95e04f8c25592ee8d15adc2dacf0b25c8c0b2c"
15771577
},
15781578
"require": {
15791579
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -1642,7 +1642,7 @@
16421642
"dist": {
16431643
"type": "path",
16441644
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1645-
"reference": "9cb4af356da11e5f7371b70715b041acb2799a39"
1645+
"reference": "98f6a2d609fc3c1ee46f1e9afbecfde9afdd65fb"
16461646
},
16471647
"require": {
16481648
"automattic/jetpack-status": "^5.4.1-alpha",
@@ -1701,7 +1701,7 @@
17011701
"dist": {
17021702
"type": "path",
17031703
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1704-
"reference": "ff09e3ed6304b1b647876c1cb0e0acb217210635"
1704+
"reference": "93ac14811dde0b104af53eb3dfff30fcfe3c8752"
17051705
},
17061706
"require": {
17071707
"php": ">=7.2"
@@ -1759,7 +1759,7 @@
17591759
"dist": {
17601760
"type": "path",
17611761
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
1762-
"reference": "3b94a0ab28587ec3390fefb35cbc39dd131edbee"
1762+
"reference": "88776cc835ac10d07439e31dd178140289eb1f03"
17631763
},
17641764
"require": {
17651765
"automattic/jetpack-connection": "^6.15.0-alpha",
@@ -1829,7 +1829,7 @@
18291829
"dist": {
18301830
"type": "path",
18311831
"url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin",
1832-
"reference": "aa7fb9dffd56bc2c08e1054e030f2bcaddbe8a76"
1832+
"reference": "150e1bdeac49faa2d001c345a13fbbfe6fd2b518"
18331833
},
18341834
"require": {
18351835
"automattic/jetpack-blaze": "^0.25.36",
@@ -1901,7 +1901,7 @@
19011901
"dist": {
19021902
"type": "path",
19031903
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1904-
"reference": "622c2857172aac162e89edadca19ae88f4c48f5a"
1904+
"reference": "22c14feaa7a7e1a77fa8eade2127d67103fbeabe"
19051905
},
19061906
"require": {
19071907
"automattic/jetpack-constants": "^3.0.8",
@@ -1969,7 +1969,7 @@
19691969
"dist": {
19701970
"type": "path",
19711971
"url": "/tmp/jetpack-build/Automattic/jetpack-subscribers-dashboard",
1972-
"reference": "8cebee2137ebb2fba91b2dc233569328633804af"
1972+
"reference": "f1246990d8c34f66a88e3487a349162f87b7c8cd"
19731973
},
19741974
"require": {
19751975
"automattic/jetpack-connection": "^6.15.0-alpha",
@@ -2051,7 +2051,7 @@
20512051
"dist": {
20522052
"type": "path",
20532053
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
2054-
"reference": "7d0a3d23c2b0553502d539773f3d35e453e570db"
2054+
"reference": "2ad9e79ac61166ebfbd2cce2909d47b046c2c18b"
20552055
},
20562056
"require": {
20572057
"automattic/jetpack-connection": "^6.15.0-alpha",
@@ -2127,7 +2127,7 @@
21272127
"dist": {
21282128
"type": "path",
21292129
"url": "/tmp/jetpack-build/Automattic/scheduled-updates",
2130-
"reference": "e99da5e11be632ca80b3b09900462bd2bdd0c85d"
2130+
"reference": "9d25b823b03c6aa28c93c40765a5aa6ea66c04a7"
21312131
},
21322132
"require": {
21332133
"automattic/jetpack-connection": "^6.15.0-alpha",

0 commit comments

Comments
 (0)