{ createInterpolateElement(
__(
- ' Get in touch with us to get your site backups going again.',
+ 'Get in touch with us to get your site backups going again.',
'jetpack-backup-pkg'
),
{
diff --git a/projects/packages/classic-theme-helper/changelog/add-require-content-options-in-classic-theme-helper-package b/projects/packages/classic-theme-helper/changelog/add-require-content-options-in-classic-theme-helper-package
new file mode 100644
index 0000000000000..58e968282a271
--- /dev/null
+++ b/projects/packages/classic-theme-helper/changelog/add-require-content-options-in-classic-theme-helper-package
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Content Options: Ensuring feature is now required.
diff --git a/projects/packages/classic-theme-helper/src/class-main.php b/projects/packages/classic-theme-helper/src/class-main.php
index 8b230e3d2a7c6..27dce7a41d518 100644
--- a/projects/packages/classic-theme-helper/src/class-main.php
+++ b/projects/packages/classic-theme-helper/src/class-main.php
@@ -26,6 +26,7 @@ class Main {
'site-breadcrumbs.php',
'social-menu.php',
'jetpack-color.php',
+ 'content-options.php',
);
/** Holds the singleton instance of the Loader
diff --git a/projects/packages/classic-theme-helper/src/content-options/customizer.js b/projects/packages/classic-theme-helper/src/content-options/customizer.js
index e853604242cdd..5170db0277d57 100644
--- a/projects/packages/classic-theme-helper/src/content-options/customizer.js
+++ b/projects/packages/classic-theme-helper/src/content-options/customizer.js
@@ -1,4 +1,4 @@
-/* global blogDisplay, postDetails */
+/* global blogDisplay, postDetails, wp */
/**
* customizer.js
@@ -6,213 +6,143 @@
* Theme Customizer enhancements for a better user experience.
*
* Contains handlers to make Theme Customizer preview reload changes asynchronously.
- * @param $
*/
-jQuery( function ( $, wp ) {
- // Blog Display
- wp.customize( 'jetpack_content_blog_display', function ( value ) {
- if ( 'content' === blogDisplay.display ) {
- $( '.jetpack-blog-display.jetpack-the-excerpt' ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-content' ).css( {
- clip: 'auto',
- position: 'relative',
- } );
- } else if ( 'excerpt' === blogDisplay.display ) {
- $( '.jetpack-blog-display.jetpack-the-content' ).css( {
+/**
+ * Function to apply styles to elements based on the display type
+ * @param {object} selectors - HTML selectors which styles will apply to.
+ * @param {object} styles - Styles to be applied to selectors.
+ */
+function applyStyles( selectors, styles ) {
+ document.querySelectorAll( selectors ).forEach( el => {
+ for ( const [ key, value ] of Object.entries( styles ) ) {
+ el.style[ key ] = value;
+ }
+ } );
+}
+
+// Blog Display
+wp.customize( 'jetpack_content_blog_display', function ( value ) {
+ /**
+ * Updates the blog display based on the selected option.
+ * @param {string} to - Content display option.
+ */
+ function updateBlogDisplay( to ) {
+ const contentSelectors = '.jetpack-blog-display.jetpack-the-content';
+ const excerptSelectors = '.jetpack-blog-display.jetpack-the-excerpt';
+ const featuredContentSelectors = '.featured-content .jetpack-blog-display';
+
+ if ( to === 'content' ) {
+ applyStyles( `${ excerptSelectors }, ${ featuredContentSelectors }.jetpack-the-excerpt`, {
clip: 'rect(1px, 1px, 1px, 1px)',
position: 'absolute',
} );
- $( '.jetpack-blog-display.jetpack-the-excerpt' ).css( {
+ applyStyles( `${ contentSelectors }, ${ featuredContentSelectors }.jetpack-the-content`, {
clip: 'auto',
position: 'relative',
} );
- } else if ( 'mixed' === blogDisplay.display ) {
- $( '.jetpack-blog-display.jetpack-the-content.output-the-content' ).css( {
- clip: 'auto',
- position: 'relative',
- } );
- $( '.jetpack-blog-display.jetpack-the-excerpt.output-the-content' ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-content.output-the-excerpt' ).css( {
+ } else if ( to === 'excerpt' ) {
+ applyStyles( `${ contentSelectors }, ${ featuredContentSelectors }.jetpack-the-content`, {
clip: 'rect(1px, 1px, 1px, 1px)',
position: 'absolute',
} );
- $( '.jetpack-blog-display.jetpack-the-excerpt.output-the-excerpt' ).css( {
+ applyStyles( `${ excerptSelectors }, ${ featuredContentSelectors }.jetpack-the-excerpt`, {
clip: 'auto',
position: 'relative',
} );
- }
- value.bind( function ( to ) {
- if ( 'content' === to ) {
- $( '.jetpack-blog-display.jetpack-the-excerpt' ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-content' ).css( {
- clip: 'auto',
- position: 'relative',
- } );
- } else if ( 'excerpt' === to ) {
- $( '.jetpack-blog-display.jetpack-the-content' ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-excerpt' ).css( {
- clip: 'auto',
- position: 'relative',
- } );
- } else if ( 'mixed' === to ) {
- $( '.jetpack-blog-display.jetpack-the-content.output-the-content' ).css( {
+ } else if ( to === 'mixed' ) {
+ applyStyles(
+ `${ contentSelectors }.output-the-content, ${ featuredContentSelectors }.jetpack-the-content.output-the-content`,
+ {
clip: 'auto',
position: 'relative',
- } );
- $( '.jetpack-blog-display.jetpack-the-excerpt.output-the-content' ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-content.output-the-excerpt' ).css( {
+ }
+ );
+ applyStyles(
+ `${ excerptSelectors }.output-the-content, ${ contentSelectors }.output-the-excerpt, ${ featuredContentSelectors }.jetpack-the-excerpt.output-the-content, ${ featuredContentSelectors }.jetpack-the-content.output-the-excerpt`,
+ {
clip: 'rect(1px, 1px, 1px, 1px)',
position: 'absolute',
- } );
- $( '.jetpack-blog-display.jetpack-the-excerpt.output-the-excerpt' ).css( {
+ }
+ );
+ applyStyles(
+ `${ excerptSelectors }.output-the-excerpt, ${ featuredContentSelectors }.jetpack-the-excerpt.output-the-excerpt`,
+ {
clip: 'auto',
position: 'relative',
- } );
- }
- if ( blogDisplay.masonry ) {
- $( blogDisplay.masonry ).masonry();
+ }
+ );
+ }
+
+ if ( blogDisplay.masonry ) {
+ const masonryElement = document.querySelector( blogDisplay.masonry );
+ if ( masonryElement ) {
+ masonryElement.masonry();
}
- } );
+ }
+ }
+
+ updateBlogDisplay( blogDisplay.display );
+ value.bind( updateBlogDisplay );
+} );
+
+/**
+ * Function to update post details visibility
+ * @param {object} selectors - HTML selectors which styles will apply to.
+ * @param {string} to - Content display option.
+ * @param {string} hiddenClass - Class to be added to the body when the post details are hidden.
+ */
+function updatePostDetails( selectors, to, hiddenClass ) {
+ document.querySelectorAll( selectors ).forEach( element => {
+ if ( to === false ) {
+ element.style.clip = 'rect(1px, 1px, 1px, 1px)';
+ element.style.height = '1px';
+ element.style.overflow = 'hidden';
+ element.style.position = 'absolute';
+ element.style.width = '1px';
+ document.body.classList.add( hiddenClass );
+ } else {
+ element.style.clip = 'auto';
+ element.style.height = 'auto';
+ element.style.overflow = 'auto';
+ element.style.position = 'relative';
+ element.style.width = 'auto';
+ document.body.classList.remove( hiddenClass );
+ }
} );
+}
- // Post Details: Date.
- wp.customize( 'jetpack_content_post_details_date', function ( value ) {
- value.bind( function ( to ) {
- if ( false === to ) {
- $( postDetails.date ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- height: '1px',
- overflow: 'hidden',
- position: 'absolute',
- width: '1px',
- } );
- $( 'body' ).addClass( 'date-hidden' );
- } else {
- $( postDetails.date ).css( {
- clip: 'auto',
- height: 'auto',
- overflow: 'auto',
- position: 'relative',
- width: 'auto',
- } );
- $( 'body' ).removeClass( 'date-hidden' );
- }
- } );
+// Post Details: Date
+wp.customize( 'jetpack_content_post_details_date', function ( value ) {
+ value.bind( function ( to ) {
+ updatePostDetails( postDetails.date, to, 'date-hidden' );
} );
+} );
- // Post Details: Categories.
- wp.customize( 'jetpack_content_post_details_categories', function ( value ) {
- value.bind( function ( to ) {
- if ( false === to ) {
- $( postDetails.categories ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- height: '1px',
- overflow: 'hidden',
- position: 'absolute',
- width: '1px',
- } );
- $( 'body' ).addClass( 'categories-hidden' );
- } else {
- $( postDetails.categories ).css( {
- clip: 'auto',
- height: 'auto',
- overflow: 'auto',
- position: 'relative',
- width: 'auto',
- } );
- $( 'body' ).removeClass( 'categories-hidden' );
- }
- } );
+// Post Details: Categories
+wp.customize( 'jetpack_content_post_details_categories', function ( value ) {
+ value.bind( function ( to ) {
+ updatePostDetails( postDetails.categories, to, 'categories-hidden' );
} );
+} );
- // Post Details: Tags.
- wp.customize( 'jetpack_content_post_details_tags', function ( value ) {
- value.bind( function ( to ) {
- if ( false === to ) {
- $( postDetails.tags ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- height: '1px',
- overflow: 'hidden',
- position: 'absolute',
- width: '1px',
- } );
- $( 'body' ).addClass( 'tags-hidden' );
- } else {
- $( postDetails.tags ).css( {
- clip: 'auto',
- height: 'auto',
- overflow: 'auto',
- position: 'relative',
- width: 'auto',
- } );
- $( 'body' ).removeClass( 'tags-hidden' );
- }
- } );
+// Post Details: Tags
+wp.customize( 'jetpack_content_post_details_tags', function ( value ) {
+ value.bind( function ( to ) {
+ updatePostDetails( postDetails.tags, to, 'tags-hidden' );
} );
+} );
- // Post Details: Author.
- wp.customize( 'jetpack_content_post_details_author', function ( value ) {
- value.bind( function ( to ) {
- if ( false === to ) {
- $( postDetails.author ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- height: '1px',
- overflow: 'hidden',
- position: 'absolute',
- width: '1px',
- } );
- $( 'body' ).addClass( 'author-hidden' );
- } else {
- $( postDetails.author ).css( {
- clip: 'auto',
- height: 'auto',
- overflow: 'auto',
- position: 'relative',
- width: 'auto',
- } );
- $( 'body' ).removeClass( 'author-hidden' );
- }
- } );
+// Post Details: Author
+wp.customize( 'jetpack_content_post_details_author', function ( value ) {
+ value.bind( function ( to ) {
+ updatePostDetails( postDetails.author, to, 'author-hidden' );
} );
+} );
- // Post Details: Comment link.
- wp.customize( 'jetpack_content_post_details_comment', function ( value ) {
- value.bind( function ( to ) {
- if ( false === to ) {
- $( postDetails.comment ).css( {
- clip: 'rect(1px, 1px, 1px, 1px)',
- height: '1px',
- overflow: 'hidden',
- position: 'absolute',
- width: '1px',
- } );
- $( 'body' ).addClass( 'comment-hidden' );
- } else {
- $( postDetails.comment ).css( {
- clip: 'auto',
- height: 'auto',
- overflow: 'auto',
- position: 'relative',
- width: 'auto',
- } );
- $( 'body' ).removeClass( 'comment-hidden' );
- }
- } );
+// Post Details: Comment link
+wp.customize( 'jetpack_content_post_details_comment', function ( value ) {
+ value.bind( function ( to ) {
+ updatePostDetails( postDetails.comment, to, 'comment-hidden' );
} );
-} )( jQuery );
+} );
diff --git a/projects/packages/classic-theme-helper/src/content-options/customizer.php b/projects/packages/classic-theme-helper/src/content-options/customizer.php
index 7cbe45cac7a59..b5305c97d0baa 100644
--- a/projects/packages/classic-theme-helper/src/content-options/customizer.php
+++ b/projects/packages/classic-theme-helper/src/content-options/customizer.php
@@ -5,6 +5,8 @@
* @package automattic/jetpack-classic-theme-helper
*/
+use Automattic\Jetpack\Assets;
+
if ( ! function_exists( 'jetpack_content_options_customize_register' ) ) {
/**
@@ -493,7 +495,18 @@ function jetpack_content_options_customize_preview_js() {
$author = ( ! empty( $post_details['author'] ) ) ? $post_details['author'] : null;
$comment = ( ! empty( $post_details['comment'] ) ) ? $post_details['comment'] : null;
- wp_enqueue_script( 'jetpack-content-options-customizer', plugins_url( 'customizer.js', __FILE__ ), array( 'jquery', 'customize-preview' ), '1.0', true );
+ Assets::register_script(
+ 'jetpack-content-options-customizer',
+ '../../dist/content-options/customizer.js',
+ __FILE__,
+ array(
+ 'dependencies' => array(
+ 'customize-preview',
+ ),
+ 'in_footer' => true,
+ 'enqueue' => true,
+ )
+ );
wp_localize_script(
'jetpack-content-options-customizer',
diff --git a/projects/packages/classic-theme-helper/src/content-options/post-details.php b/projects/packages/classic-theme-helper/src/content-options/post-details.php
index 3e4fbc3f9f526..dc21f60d3b6bb 100644
--- a/projects/packages/classic-theme-helper/src/content-options/post-details.php
+++ b/projects/packages/classic-theme-helper/src/content-options/post-details.php
@@ -60,8 +60,10 @@ function jetpack_post_details_enqueue_scripts() {
$css = $elements . ' { clip: rect(1px, 1px, 1px, 1px); height: 1px; position: absolute; overflow: hidden; width: 1px; }';
// Add the CSS to the stylesheet.
- // @phan-suppress-next-line PhanTypeArraySuspiciousNullable.
- wp_add_inline_style( $post_details['stylesheet'], $css );
+
+ if ( is_array( $post_details ) && isset( $post_details['stylesheet'] ) ) {
+ wp_add_inline_style( $post_details['stylesheet'], $css );
+ }
}
add_action( 'wp_enqueue_scripts', 'jetpack_post_details_enqueue_scripts' );
diff --git a/projects/packages/connection/changelog/fix-connected-plugins-on-multisites b/projects/packages/connection/changelog/fix-connected-plugins-on-multisites
new file mode 100644
index 0000000000000..a608ebf17009c
--- /dev/null
+++ b/projects/packages/connection/changelog/fix-connected-plugins-on-multisites
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix the connected plugins option on multisites.
diff --git a/projects/packages/connection/src/class-plugin-storage.php b/projects/packages/connection/src/class-plugin-storage.php
index 21d9402bf0e29..c722a7f022a60 100644
--- a/projects/packages/connection/src/class-plugin-storage.php
+++ b/projects/packages/connection/src/class-plugin-storage.php
@@ -144,7 +144,10 @@ private static function ensure_configured() {
}
if ( is_multisite() && get_current_blog_id() !== self::$current_blog_id ) {
- self::$plugins = (array) get_option( self::ACTIVE_PLUGINS_OPTION_NAME, array() );
+ if ( self::$current_blog_id ) {
+ // If blog ID got changed, pull the list of active plugins for that blog from the database.
+ self::$plugins = (array) get_option( self::ACTIVE_PLUGINS_OPTION_NAME, array() );
+ }
self::$current_blog_id = get_current_blog_id();
}
diff --git a/projects/packages/device-detection/changelog/update-device-detection b/projects/packages/device-detection/changelog/update-device-detection
new file mode 100644
index 0000000000000..e413e8177c7f6
--- /dev/null
+++ b/projects/packages/device-detection/changelog/update-device-detection
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Device_Detection::get_info() will now memoize its result
diff --git a/projects/packages/device-detection/src/class-device-detection.php b/projects/packages/device-detection/src/class-device-detection.php
index 767a552ccbee6..62361d7edb498 100644
--- a/projects/packages/device-detection/src/class-device-detection.php
+++ b/projects/packages/device-detection/src/class-device-detection.php
@@ -23,6 +23,20 @@
*/
class Device_Detection {
+ /**
+ * Memoization cache for get_info() results.
+ *
+ * @var array
+ */
+ private static $get_info_memo = array();
+
+ /**
+ * Maximum size of the memoization cache.
+ *
+ * @var int
+ */
+ private static $max_memo_size = 100;
+
/**
* Returns information about the current device accessing the page.
*
@@ -41,6 +55,16 @@ class Device_Detection {
* );
*/
public static function get_info( $ua = '' ) {
+ // Return memoized result if available.
+ // phpcs:disable WordPress.Security.ValidatedSanitizedInput
+ $memo_key = ! empty( $ua ) ? $ua : ( $_SERVER['HTTP_USER_AGENT'] ?? '' );
+ // Note: UA string used raw for compatibility reasons.
+ // No sanitization is needed as the value is never output or persisted, and is only used for memoization.
+ // phpcs:enable WordPress.Security.ValidatedSanitizedInput
+ if ( isset( self::$get_info_memo[ $memo_key ] ) ) {
+ return self::$get_info_memo[ $memo_key ];
+ }
+
$ua_info = new User_Agent_Info( $ua );
$info = array(
@@ -68,6 +92,13 @@ public static function get_info( $ua = '' ) {
*/
$info = apply_filters( 'jetpack_device_detection_get_info', $info, $ua, $ua_info );
}
+
+ // Memoize the result.
+ self::$get_info_memo[ $memo_key ] = $info;
+ if ( count( self::$get_info_memo ) > self::$max_memo_size ) {
+ array_shift( self::$get_info_memo );
+ }
+
return $info;
}
diff --git a/projects/packages/forms/changelog/update-wordpress-eslint-plugin b/projects/packages/forms/changelog/update-wordpress-eslint-plugin
new file mode 100644
index 0000000000000..b7741525f5678
--- /dev/null
+++ b/projects/packages/forms/changelog/update-wordpress-eslint-plugin
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Use en-dash in numeric range in i18n message to conform to guidelines.
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
index 4feab8bb8a60a..989d8aa665215 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-salesforce-lead-form/jetpack-salesforce-lead-form-settings.js
@@ -141,7 +141,7 @@ export default ( { salesforceData, setAttributes, instanceId } ) => {
{ organizationIdError && (