';
- if ( isset( $content_fields['_feedback_ip'] ) ) {
+ if ( ! empty( $content_fields['_feedback_ip'] ) ) {
echo '
' . esc_html__( 'IP', 'jetpack-forms' ) . '
';
echo '
' . esc_html( $content_fields['_feedback_ip'] ) . '
';
}
diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
index 63e9131c39f06..2d4cd6bb26397 100644
--- a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
+++ b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [5.45.0] - 2024-07-18
+### Added
+- MU WPCOM: Support localizeUrl [#38318]
+
+### Changed
+- Block Perplexity AI bot in robots.txt when opted out of data sharing. [#38400]
+- Hide wpcom features when site is agency-managed or user is local [#38364]
+
+### Fixed
+- Admin Bar: Hotfix the order of the admin menu items for WP 6.6 [#38347]
+
## [5.44.0] - 2024-07-15
### Added
- Add Profile -> My Account menu to admin bar. [#38294]
@@ -997,6 +1008,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Testing initial package release.
+[5.45.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.44.0...v5.45.0
[5.44.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.43.0...v5.44.0
[5.43.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.42.1...v5.43.0
[5.42.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.42.0...v5.42.1
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-manual-previous-70-testing b/projects/packages/jetpack-mu-wpcom/changelog/add-manual-previous-70-testing
deleted file mode 100644
index 50cd36eddae57..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/add-manual-previous-70-testing
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix a test to work with both WP 6.4 and 6.5.
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/agency-managed-check b/projects/packages/jetpack-mu-wpcom/changelog/agency-managed-check
deleted file mode 100644
index 5032112d7fb44..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/agency-managed-check
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Hide wpcom features when site is agency-managed or user is local
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-menu-order b/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-menu-order
deleted file mode 100644
index fc0a444bb802a..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-menu-order
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Admin Bar: Hotfix the order of the admin menu items for WP 6.6
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/mu-wpcom-localize-url b/projects/packages/jetpack-mu-wpcom/changelog/mu-wpcom-localize-url
deleted file mode 100644
index 6c5f685474f91..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/mu-wpcom-localize-url
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-MU WPCOM: Support localizeUrl
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-wpcom-admin-bar-wp-logo b/projects/packages/jetpack-mu-wpcom/changelog/update-wpcom-admin-bar-wp-logo
deleted file mode 100644
index 24772aa389f47..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/update-wpcom-admin-bar-wp-logo
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Minor image replacement
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 4694f87129ae2..46914fcf53321 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.45.0-alpha",
+ "version": "5.45.0",
"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 fed6a758c9f8d..e0b8e8c822a25 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.45.0-alpha';
+ const PACKAGE_VERSION = '5.45.0';
const PKG_DIR = __DIR__ . '/../';
const BASE_DIR = __DIR__ . '/';
const BASE_FILE = __FILE__;
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php b/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php
index ad3dfcf65f650..6c864472010af 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php
@@ -45,6 +45,7 @@ function robots_txt( string $output, $public ): string {
'GPTBot',
'omgili',
'omgilibot',
+ 'PerplexityBot',
'SentiBot',
'sentibot',
);
diff --git a/projects/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php b/projects/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php
index 189b41b793058..327068b785d4a 100644
--- a/projects/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php
+++ b/projects/packages/jetpack-mu-wpcom/tests/php/features/blog-privacy/class-blog-privacy-test.php
@@ -61,6 +61,9 @@ public function provide_robots_txt(): \Iterator {
User-agent: omgilibot
Disallow: /
+User-agent: PerplexityBot
+Disallow: /
+
User-agent: SentiBot
Disallow: /
diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
index 4cce80ff7befb..8a8dd0a056ad4 100644
--- a/projects/packages/jitm/CHANGELOG.md
+++ b/projects/packages/jitm/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [3.1.14] - 2024-07-18
+### Changed
+- Update margins on jitms in my jetpack [#38283]
+
## [3.1.13] - 2024-07-03
### Changed
- Updated package dependencies. [#38132]
@@ -731,6 +735,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update Jetpack to use new JITM package
+[3.1.14]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.13...v3.1.14
[3.1.13]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.12...v3.1.13
[3.1.12]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.11...v3.1.12
[3.1.11]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.10...v3.1.11
diff --git a/projects/packages/jitm/changelog/update-my-jetpack-jitm-css b/projects/packages/jitm/changelog/update-my-jetpack-jitm-css
deleted file mode 100644
index ae68b7c731bd7..0000000000000
--- a/projects/packages/jitm/changelog/update-my-jetpack-jitm-css
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Update margins on jitms in my jetpack
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index d740bcc2bb513..0d718af187365 100644
--- a/projects/packages/jitm/src/class-jitm.php
+++ b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
*/
class JITM {
- const PACKAGE_VERSION = '3.1.14-alpha';
+ const PACKAGE_VERSION = '3.1.14';
/**
* The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/masterbar/changelog/fix-warning-masterbar-undefined-array-key b/projects/packages/masterbar/changelog/fix-warning-masterbar-undefined-array-key
new file mode 100644
index 0000000000000..8dc6512cd0120
--- /dev/null
+++ b/projects/packages/masterbar/changelog/fix-warning-masterbar-undefined-array-key
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Masterbar: Fix undefined array key warning in Base_Admin_Menu::hide_parent_of_hidden_submenus
diff --git a/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php
index 0a82ee4ac89fa..4b53b4aa3da7d 100644
--- a/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php
+++ b/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php
@@ -494,10 +494,8 @@ public function hide_parent_of_hidden_submenus() {
$this->sort_hidden_submenus();
foreach ( $menu as $menu_index => $menu_item ) {
- $has_submenus = isset( $submenu[ $menu_item[2] ] );
-
// Skip if the menu doesn't have submenus.
- if ( ! $has_submenus || ! is_array( $submenu[ $menu_item[2] ] ) ) {
+ if ( empty( $submenu[ $menu_item[2] ] ) || ! is_array( $submenu[ $menu_item[2] ] ) ) {
continue;
}
diff --git a/projects/packages/masterbar/tests/php/test-class-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-admin-menu.php
index 0c7c409f1bb26..72652f0f6ea9b 100644
--- a/projects/packages/masterbar/tests/php/test-class-admin-menu.php
+++ b/projects/packages/masterbar/tests/php/test-class-admin-menu.php
@@ -500,6 +500,15 @@ public function hide_menu_based_on_submenu_provider() {
),
array( '', 'read', 'test-slug', '', Base_Admin_Menu::HIDE_CSS_CLASS ),
),
+ array(
+ array(
+ array( '', 'read', 'test-empty-submenu', '', '' ),
+ ),
+ array(
+ 'test-empty-submenu' => array(),
+ ),
+ array( '', 'read', 'test-empty-submenu', '', '' ),
+ ),
);
}
diff --git a/projects/packages/search/changelog/fix-jetpack_search_customberg-events b/projects/packages/search/changelog/fix-jetpack_search_customberg-events
new file mode 100644
index 0000000000000..c5267a874fa5a
--- /dev/null
+++ b/projects/packages/search/changelog/fix-jetpack_search_customberg-events
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: This commit fixes the property of a Tracks event that was being sent as a JSON, which is not a valid Tracks value.
+
+
diff --git a/projects/packages/search/changelog/force-a-release b/projects/packages/search/changelog/force-a-release
new file mode 100644
index 0000000000000..d4ad6c7cc3379
--- /dev/null
+++ b/projects/packages/search/changelog/force-a-release
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index ae664f62b2c7c..e8089450aad85 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
{
"name": "jetpack-search",
- "version": "0.44.12",
+ "version": "0.44.13-alpha",
"description": "Package for Jetpack Search products",
"main": "main.js",
"directories": {
diff --git a/projects/packages/search/src/class-package.php b/projects/packages/search/src/class-package.php
index 23f1e7b800a88..abb41f7635aac 100644
--- a/projects/packages/search/src/class-package.php
+++ b/projects/packages/search/src/class-package.php
@@ -11,7 +11,7 @@
* Search package general information
*/
class Package {
- const VERSION = '0.44.12';
+ const VERSION = '0.44.13-alpha';
const SLUG = 'search';
/**
diff --git a/projects/packages/search/src/customberg/components/save-button/index.jsx b/projects/packages/search/src/customberg/components/save-button/index.jsx
index f7738338f2d1b..97f42027077ce 100644
--- a/projects/packages/search/src/customberg/components/save-button/index.jsx
+++ b/projects/packages/search/src/customberg/components/save-button/index.jsx
@@ -1,7 +1,6 @@
import { Button } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import useEntityRecordState from 'hooks/use-entity-record-state';
-import { SERVER_OBJECT_NAME } from 'instant-search/lib/constants';
import { eventPrefix, recordEvent } from 'lib/analytics';
import './styles.scss';
@@ -11,22 +10,13 @@ import './styles.scss';
* @returns {Element} component instance
*/
export default function SaveButton() {
- const {
- editedEntities: editedSettings,
- isSaving,
- hasUnsavedEdits,
- saveRecords,
- } = useEntityRecordState();
+ const { isSaving, hasUnsavedEdits, saveRecords } = useEntityRecordState();
const onClick = ( ...args ) => {
if ( isSaving ) {
return;
}
- recordEvent( `${ eventPrefix }_save_button_click`, {
- initialSettings: JSON.stringify( window[ SERVER_OBJECT_NAME ].overlayOptions ),
- changedSettings: JSON.stringify( editedSettings ),
- changedSettingNames: Object.keys( editedSettings ).join( ',' ),
- } );
+ recordEvent( `${ eventPrefix }_save_button_click` );
saveRecords( ...args );
};
diff --git a/projects/packages/videopress/changelog/force-a-release b/projects/packages/videopress/changelog/force-a-release
new file mode 100644
index 0000000000000..d4ad6c7cc3379
--- /dev/null
+++ b/projects/packages/videopress/changelog/force-a-release
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update dependencies.
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
index c9f1491f14ef8..cca4e342db1d2 100644
--- a/projects/packages/videopress/package.json
+++ b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-videopress",
- "version": "0.23.27",
+ "version": "0.23.28-alpha",
"description": "VideoPress package",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
"bugs": {
diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php
index 7731681da6455..22e4e0745ad65 100644
--- a/projects/packages/videopress/src/class-package-version.php
+++ b/projects/packages/videopress/src/class-package-version.php
@@ -11,7 +11,7 @@
* The Package_Version class.
*/
class Package_Version {
- const PACKAGE_VERSION = '0.23.27';
+ const PACKAGE_VERSION = '0.23.28-alpha';
const PACKAGE_SLUG = 'videopress';
diff --git a/projects/plugins/jetpack/_inc/client/newsletter/newsletter.jsx b/projects/plugins/jetpack/_inc/client/newsletter/newsletter.jsx
index 4a0b5ae04ba23..48159eda50034 100644
--- a/projects/plugins/jetpack/_inc/client/newsletter/newsletter.jsx
+++ b/projects/plugins/jetpack/_inc/client/newsletter/newsletter.jsx
@@ -85,7 +85,10 @@ function Newsletter( props ) {
toggleModule={ toggleModuleNow }
>
- { __( 'Let visitors subscribe to this site', 'jetpack' ) }
+ { __(
+ 'Let visitors subscribe to this site and receive emails when you publish a post',
+ 'jetpack'
+ ) }
diff --git a/projects/plugins/jetpack/changelog/fix-dockblock-comments-google-fonts b/projects/plugins/jetpack/changelog/fix-dockblock-comments-google-fonts
new file mode 100644
index 0000000000000..934896edb41ed
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-dockblock-comments-google-fonts
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Google Fonts: adjust docblocks for better codex generation
+
+
diff --git a/projects/plugins/jetpack/changelog/update-newsletter-toggle-label b/projects/plugins/jetpack/changelog/update-newsletter-toggle-label
new file mode 100644
index 0000000000000..076f04433ae44
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-newsletter-toggle-label
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Subscriptions: Update Newsletter module toggle label
diff --git a/projects/plugins/jetpack/modules/google-fonts/current/load-google-fonts.php b/projects/plugins/jetpack/modules/google-fonts/current/load-google-fonts.php
index 3676e8636469c..338c12a7cef8e 100644
--- a/projects/plugins/jetpack/modules/google-fonts/current/load-google-fonts.php
+++ b/projects/plugins/jetpack/modules/google-fonts/current/load-google-fonts.php
@@ -59,6 +59,8 @@ function jetpack_get_google_fonts_data() {
/**
* Filters the Google Fonts API URL.
*
+ * @module google-fonts
+ *
* @since 12.8
*
* @param string $url The Google Fonts API URL.
diff --git a/projects/plugins/jetpack/modules/google-fonts/load.php b/projects/plugins/jetpack/modules/google-fonts/load.php
index d812219478f8c..76e380c7fbf7b 100644
--- a/projects/plugins/jetpack/modules/google-fonts/load.php
+++ b/projects/plugins/jetpack/modules/google-fonts/load.php
@@ -8,20 +8,22 @@
add_action(
'plugins_loaded',
function () {
- /**
- * Filters whether to skip loading the Jetpack Google Fonts module.
- *
- * This filter allows skipping the loading of the Jetpack Google Fonts module
- * based on specific conditions or requirements. By default, the module will
- * load normally. If the filter returns true, the module will be skipped.
- *
- * @module google-fonts
- *
- * @since 13.4
- *
- * @param bool $skip Whether to skip loading the Jetpack Google Fonts module. Default false.
- */
- if ( apply_filters( 'jetpack_google_fonts_skip_load', false ) ) {
+ if (
+ /**
+ * Filters whether to skip loading the Jetpack Google Fonts module.
+ *
+ * This filter allows skipping the loading of the Jetpack Google Fonts module
+ * based on specific conditions or requirements. By default, the module will
+ * load normally. If the filter returns true, the module will be skipped.
+ *
+ * @module google-fonts
+ *
+ * @since 13.4
+ *
+ * @param bool $skip Whether to skip loading the Jetpack Google Fonts module. Default false.
+ */
+ apply_filters( 'jetpack_google_fonts_skip_load', false )
+ ) {
return;
}
diff --git a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
index 87c8976006ace..d0761c551d84e 100644
--- a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
+++ b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 2.4.1 - 2024-07-18
+### Changed
+- Internal updates.
+
## 2.4.0 - 2024-07-15
### Added
- Composer lock update. [#38241]
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
index 06c5a659657e8..220af3bc0d16d 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.json
+++ b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -46,6 +46,6 @@
]
},
"config": {
- "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_4_1_alpha"
+ "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_4_1"
}
}
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
index 6594f8e03d3ac..5467901b57ba3 100644
--- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
+++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
*
* Plugin Name: WordPress.com Features
* Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 2.4.1-alpha
+ * Version: 2.4.1
* Author: Automattic
* License: GPLv2 or later
* Text Domain: jetpack-mu-wpcom-plugin
diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json
index 1a488f74ca126..9f3a5da876105 100644
--- a/projects/plugins/mu-wpcom-plugin/package.json
+++ b/projects/plugins/mu-wpcom-plugin/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-mu-wpcom-plugin",
- "version": "2.4.1-alpha",
+ "version": "2.4.1",
"description": "Test plugin for the jetpack-mu-wpcom package",
"homepage": "https://jetpack.com",
"bugs": {