Skip to content

Commit a790670

Browse files
BogdanUngureanumatticbot
BogdanUngureanu
authored and
matticbot
committed
Untangling: Remove Settings > Server Settings and Hosting features (#44313)
* Untangling: Remove Settings > Server Settings * Remove Hosting features Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/16347097150 Upstream-Ref: Automattic/jetpack@f8a2db7
1 parent 4094489 commit a790670

File tree

6 files changed

+85
-106
lines changed

6 files changed

+85
-106
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -330,17 +330,6 @@ public function add_upgrades_menu( $plan = null ) {
330330
public function add_options_menu() {
331331
parent::add_options_menu();
332332

333-
$has_feature_atomic = function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::ATOMIC );
334-
add_submenu_page(
335-
'options-general.php',
336-
$has_feature_atomic ? esc_attr__( 'Server Settings', 'jetpack-masterbar' ) : esc_attr__( 'Hosting Features', 'jetpack-masterbar' ),
337-
$has_feature_atomic ? __( 'Server Settings', 'jetpack-masterbar' ) : __( 'Hosting Features', 'jetpack-masterbar' ),
338-
'manage_options',
339-
$has_feature_atomic ? 'https://wordpress.com/hosting-config/' . $this->domain : 'https://wordpress.com/hosting-features/' . $this->domain,
340-
null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
341-
11
342-
);
343-
344333
// Hide Settings > Performance when the interface is set to wp-admin.
345334
// This is due to these settings are mostly also available in Jetpack > Settings, in the Performance tab.
346335
if ( $this->use_wp_admin_interface() ) {

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,6 @@ public function add_users_menu() {
278278
}
279279
}
280280

281-
/**
282-
* Adds Settings menu.
283-
*/
284-
public function add_options_menu() {
285-
parent::add_options_menu();
286-
287-
// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
288-
add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Features', 'jetpack-masterbar' ), __( 'Hosting Features', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-features/' . $this->domain, null, 10 );
289-
}
290-
291281
/**
292282
* Also remove the Gutenberg plugin menu.
293283
*/

‎jetpack_vendor/i18n-map.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
),
5151
'jetpack-masterbar' => array(
5252
'path' => 'jetpack_vendor/automattic/jetpack-masterbar',
53-
'ver' => '0.19.0-alpha1752758796',
53+
'ver' => '0.19.0-alpha1752760555',
5454
),
5555
'jetpack-mu-wpcom' => array(
5656
'path' => 'jetpack_vendor/automattic/jetpack-mu-wpcom',

‎vendor/composer/installed.json

Lines changed: 33 additions & 33 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": "a05dd132b350e0b2a32c3ae001c725c16cd9153e"
87+
"reference": "e030edaceddebb0ca29aaf778ef6baaa7949c57b"
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": "48a1db9668ee5bf582337c626b773763a891dcbb"
144+
"reference": "6508efe68bbb430c50482c8da0d9eab06f7ef619"
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": "057132379853f7d17ed7609780df3190c43358b5"
207+
"reference": "132a50b65ade17efef7bf0bcd95c5bf5718482b4"
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": "70bfec12b4c3bb9e7ee53de0257f5c027cca3b2c"
281+
"reference": "9601b154d7cc7a62b8f190e7ecea493559c3b022"
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": "939816edcc97b56d4d7ffdeff67937e25c4653ff"
353+
"reference": "dcc5c4799fc6543eac7cbf9b9c9ed31d701b08f3"
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": "9b43421f7dbe6967a9edf50780b5209e5e5708ea"
432+
"reference": "d94fbaf1c61dcb6a0faad227a667508da76d7095"
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": "fd71b0282984680e8036659bbb291085452182c8"
492+
"reference": "06598c654ad3b287c936cfcedc886a2d8394d8ce"
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": "0c52ebcdf85fa46604baa4ac091228999351cc8a"
561+
"reference": "00afe66a0444ad0c49744cc24215999369a8e587"
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": "55e1e31a6a717c6ffaf93b2779857a1bbbb98f55"
629+
"reference": "9c598f73d24fd8a9aee169a21d2ea4774cd23e32"
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": "b7114c974e8ca6a5f4a48377933938644efdb932"
669+
"reference": "2d1b2a8155b63cb83280e0cd4375cf7b78f95893"
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": "0dd3d58afb7d228d5cae6de6c90efb47ddaabf35"
733+
"reference": "448623b02f626968e0db65043abe991520d4fa0c"
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": "8cc3c2865be1982838bea2e6933e952274637e4e"
808+
"reference": "37e0644734f5a231009547c2cf748e1ace5b9c77"
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": "1676bb7776f533bf4e5cbc4af2fc00f7b655aa67"
896+
"reference": "caf8b126a01938072b94ff429b5b1e5c3abe5c0c"
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": "f5cf2a033c2acafa247e166b31769c8b2c9a4a43"
954+
"reference": "eebe9c38825d9ca9dd3fc8da7226185536578c3e"
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": "0baf6e7f94e0769ef1d71fd2f65cb41eb26b5f75"
1011+
"reference": "6815a5d37978192be86851bb9ea569c65850403b"
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": "258e59f6f9f266ad28195d8b97034ce9b06af529"
1080+
"reference": "a71a32460320734c5853e0bf5650ab2a4be37368"
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": "50f71a8fe42ff6e69d638da8b9204bd65320eed5"
1142+
"reference": "284f07d5fdda2f407772e876d4f7bf363f722a4f"
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": "41cdfe8547161d7e03baba8983fcc872ee60ad58"
1221+
"reference": "8fbd8ca3e98fa9f462c0b8494df481a67c6e536a"
12221222
},
12231223
"require": {
12241224
"php": ">=7.2"
@@ -1270,12 +1270,12 @@
12701270
},
12711271
{
12721272
"name": "automattic/jetpack-masterbar",
1273-
"version": "0.19.0-alpha.1752758796",
1274-
"version_normalized": "0.19.0.0-alpha1752758796",
1273+
"version": "0.19.0-alpha.1752760555",
1274+
"version_normalized": "0.19.0.0-alpha1752760555",
12751275
"dist": {
12761276
"type": "path",
12771277
"url": "/tmp/jetpack-build/Automattic/jetpack-masterbar",
1278-
"reference": "16dd747415ef3b8a055428b33334698d1c27c7ea"
1278+
"reference": "3f2ee0e6d5b263e6173bc8ea5834bcc5f4b86868"
12791279
},
12801280
"require": {
12811281
"automattic/jetpack-assets": "^4.2.0-alpha",
@@ -1361,7 +1361,7 @@
13611361
"dist": {
13621362
"type": "path",
13631363
"url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
1364-
"reference": "5d6b5d6e1b64cd58991e5831a1c58f52c40b6bb9"
1364+
"reference": "d64e8ad3e69b8a4f565f1c0a93760af1498a2d1b"
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": "1e55649d77d7f4e4fab37f8cdc6344ce3a41d0e1"
1451+
"reference": "5925c0b51f40ab1c69716de9063ae7ac74600706"
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": "ff5d4ae285d45a6ee51fc2898aea9b69a6e144f4"
1510+
"reference": "afb3ff80adb37781341bec216b941cf8e05fed4f"
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": "a2565b44d4a9a0556c13ed637bf3690444e0c438"
1576+
"reference": "71dabe29458e804c037a16e538c86c766cafd69d"
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": "d474a30328bd8f270c4fa0f29c43826caf7203a0"
1645+
"reference": "76b9470d612ab37f3fbdfa4de8548a53bc465df2"
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": "52d8be6afa342190a3e8053e570306e0114e43be"
1704+
"reference": "037004ba60bf9a4ba70ac982f2a5bafd7624b085"
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": "94af594aade1f05e11dadb604409062bbdd6d237"
1762+
"reference": "9795a97fd37c0b9312e71407c023275aef524a1f"
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": "65fb793bf182fbc25320205cd7a07957eb243b3a"
1832+
"reference": "1b25e2466bd7b31924035eadc3fd534c247fb672"
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": "b2f2b8f9838c5956a605bf0ced704407ea0d177c"
1904+
"reference": "59c063647bb0fb6051c4a592598ea0071fe1e66e"
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": "02232bdf44faeb504790b772f9d9feb8ac0d9ad5"
1972+
"reference": "cd46045eb8c426af2548d9becf1411d79d0fc481"
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": "0c0c9f8a762a16b12cc3650aced6a29a66d4335c"
2054+
"reference": "10b56f67a0065f9b2a0b3224f21b72948be9329e"
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": "23b43021f276386e07923e2a167d3d00f310482d"
2130+
"reference": "e560857bec08f68e6ae9dff90ffa7277fb1a9652"
21312131
},
21322132
"require": {
21332133
"automattic/jetpack-connection": "^6.15.0-alpha",

0 commit comments

Comments
 (0)