From d4adceb1cf4769c16a9dc752289e414d7ad7a7e5 Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Mon, 5 Aug 2024 12:37:38 -0500 Subject: [PATCH 1/6] Hide email field in general options on simple classic --- .../src/class-jetpack-mu-wpcom.php | 1 + .../general-settings-mods.php | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 46dffa5819705..f81ef79d6d722 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -103,6 +103,7 @@ public static function load_features() { require_once __DIR__ . '/features/wpcom-admin-dashboard/wpcom-admin-dashboard.php'; require_once __DIR__ . '/features/wpcom-block-editor/class-jetpack-wpcom-block-editor.php'; require_once __DIR__ . '/features/wpcom-block-editor/functions.editor-type.php'; + require_once __DIR__ . '/features/wpcom-general-settings/general-settings-mods.php'; require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-notices.php'; require_once __DIR__ . '/features/wpcom-themes/wpcom-theme-fixes.php'; diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php new file mode 100644 index 0000000000000..c75d77d552e88 --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php @@ -0,0 +1,51 @@ + + + + Date: Mon, 5 Aug 2024 12:38:12 -0500 Subject: [PATCH 2/6] changelog --- .../jetpack-mu-wpcom/changelog/remove-general-options-email | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/remove-general-options-email diff --git a/projects/packages/jetpack-mu-wpcom/changelog/remove-general-options-email b/projects/packages/jetpack-mu-wpcom/changelog/remove-general-options-email new file mode 100644 index 0000000000000..16ff5d616903c --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/remove-general-options-email @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Hide email field in general options on simple classic From 443f5e641c119ea23e1281cfac339e249e07c30a Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Mon, 5 Aug 2024 12:54:58 -0500 Subject: [PATCH 3/6] Update comments --- .../general-settings-mods.php | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php index c75d77d552e88..366d5900a3497 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php @@ -6,35 +6,42 @@ */ /** - * Initialize customizations for the options-general admin page. + * Hide the Administration Email section in General Settings on Simple Classic sites. */ -function init_admin_email_address_customizations() { +function wpcom_maybe_hide_admin_email_address() { $is_classic_site = get_option( 'wpcom_admin_interface' ) === 'wp-admin'; $is_simple_site = defined( 'IS_WPCOM' ) && IS_WPCOM; if ( $is_simple_site && $is_classic_site ) { - add_action( 'admin_enqueue_scripts', 'wpcom_hide_admin_email_address_section' ); + add_action( 'admin_enqueue_scripts', 'wpcom_hide_admin_email_address' ); } } /** - * Hide the Administration Email Address section in General Settings on Simple Classic sites. + * Hide the Administration Email section in General Settings. */ -function wpcom_hide_admin_email_address_section() { +function wpcom_hide_admin_email_address() { + /** + * Use the CSS :has selector to hide the admin email tr elegantly. However, some older browsers do not support :has. + * Fallback to hiding the elements in the tr. This leaves some white space because it doesn't remove the row. + */ ?> + Date: Mon, 5 Aug 2024 13:15:31 -0500 Subject: [PATCH 4/6] Run tools/fixup-project-versions.sh --- projects/packages/jetpack-mu-wpcom/composer.json | 2 +- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- .../mu-wpcom-plugin/changelog/remove-general-options-email | 5 +++++ projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- .../plugins/wpcomsh/changelog/remove-general-options-email | 5 +++++ projects/plugins/wpcomsh/composer.json | 2 +- projects/plugins/wpcomsh/composer.lock | 4 ++-- projects/plugins/wpcomsh/package.json | 2 +- projects/plugins/wpcomsh/wpcomsh.php | 4 ++-- 10 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/remove-general-options-email create mode 100644 projects/plugins/wpcomsh/changelog/remove-general-options-email diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json index 3bd1049903806..c07508668d7e2 100644 --- a/projects/packages/jetpack-mu-wpcom/composer.json +++ b/projects/packages/jetpack-mu-wpcom/composer.json @@ -62,7 +62,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.53.x-dev" + "dev-trunk": "5.54.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index 2e0df8f63149c..d152c4c71ed3d 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.53.0", + "version": "5.54.0-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index f81ef79d6d722..340a68ea4b97d 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.53.0'; + const PACKAGE_VERSION = '5.54.0-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; diff --git a/projects/plugins/mu-wpcom-plugin/changelog/remove-general-options-email b/projects/plugins/mu-wpcom-plugin/changelog/remove-general-options-email new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/remove-general-options-email @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 77769b61f9d56..d04a4fa94fcf9 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -1005,7 +1005,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "87d053c8aeb9e5c4da954bff7081b36977ce3ad2" + "reference": "4b4af189f1d1e871d91f7cb504a8ccfff1504571" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1039,7 +1039,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.53.x-dev" + "dev-trunk": "5.54.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/wpcomsh/changelog/remove-general-options-email b/projects/plugins/wpcomsh/changelog/remove-general-options-email new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/remove-general-options-email @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index ab294d06d404e..bfcb8ca3e89a2 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -128,7 +128,7 @@ "composer/installers": true, "roots/wordpress-core-installer": true }, - "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_0" + "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_1_alpha" }, "extra": { "mirror-repo": "Automattic/wpcom-site-helper", diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 2ccd641c15511..134bab13315fc 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -1142,7 +1142,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "87d053c8aeb9e5c4da954bff7081b36977ce3ad2" + "reference": "4b4af189f1d1e871d91f7cb504a8ccfff1504571" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1176,7 +1176,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.53.x-dev" + "dev-trunk": "5.54.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json index db07cb230f2c4..a814014e13f69 100644 --- a/projects/plugins/wpcomsh/package.json +++ b/projects/plugins/wpcomsh/package.json @@ -3,7 +3,7 @@ "name": "@automattic/jetpack-wpcomsh", "description": "A helper for connecting WordPress.com sites to external host infrastructure.", "homepage": "https://jetpack.com", - "version": "5.2.0", + "version": "5.2.1-alpha", "bugs": { "url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh" }, diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php index f366ba8d70c08..f037467f5099a 100644 --- a/projects/plugins/wpcomsh/wpcomsh.php +++ b/projects/plugins/wpcomsh/wpcomsh.php @@ -2,14 +2,14 @@ /** * Plugin Name: WordPress.com Site Helper * Description: A helper for connecting WordPress.com sites to external host infrastructure. - * Version: 5.2.0 + * Version: 5.2.1-alpha * Author: Automattic * Author URI: http://automattic.com/ * * @package wpcomsh */ -define( 'WPCOMSH_VERSION', '5.2.0' ); +define( 'WPCOMSH_VERSION', '5.2.1-alpha' ); // If true, Typekit fonts will be available in addition to Google fonts add_filter( 'jetpack_fonts_enable_typekit', '__return_true' ); From 4edc352585c5a4852878a28c69e3d4fb4975524f Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Mon, 5 Aug 2024 13:21:57 -0500 Subject: [PATCH 5/6] Run tools/fixup-project-versions.sh --- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index 43e335f667483..d873e7a7d8f2d 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.53.1-alpha", + "version": "5.54.0-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index f60e752b84334..5d97b7a94a666 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -14,7 +14,6 @@ */ class Jetpack_Mu_Wpcom { const PACKAGE_VERSION = '5.54.0-alpha'; - const PACKAGE_VERSION = '5.53.1-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; From 60324ea691792887ef1e137eb151666435ade9d8 Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Mon, 5 Aug 2024 13:39:06 -0500 Subject: [PATCH 6/6] Try to make versioning happy --- projects/plugins/wpcomsh/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index bfcb8ca3e89a2..47b34fff16c76 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -128,7 +128,7 @@ "composer/installers": true, "roots/wordpress-core-installer": true }, - "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_1_alpha" + "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_2_alpha" }, "extra": { "mirror-repo": "Automattic/wpcom-site-helper",