Merge remote-tracking branch 'origin/development/2.9.x' into fix/activate_account_via_email_link

assets/css/um-styles.css

@@ -1152,3 +1152,8 @@ small.um-max-filesize span{
 	float: none;
 	height: auto;
 }
+
+/*Makes the honeypot invisible.*/
+.um_request_name {
+	display: none !important;
+}

assets/js/um-scripts.js

@@ -698,3 +698,12 @@ jQuery(document).ready(function() {
 		}
 	});
 });
+
+// Makes the honeypot.
+jQuery( window ).on( 'load', function() {
+	let $honeypotField = jQuery('input[name="um_request"]');
+	if ( $honeypotField.length ) {
+		$honeypotField.val('');
+	}
+});
+

changelog.txt

@@ -1,6 +1,6 @@
 == Changelog ==
 
-= 2.10.0 February 17, 2025 =
+= 2.10.0 February 18, 2025 =
 
 * Enhancements:
 

includes/core/um-actions-profile.php

@@ -734,24 +734,28 @@ function um_profile_dynamic_meta_desc() {
 			$image = um_get_user_avatar_url( $user_id, 'original' );
 		}
 
-		$image      = current( explode( '?', $image ) ); // strip $_GET attributes from photo URL.
-		$image_path = wp_normalize_path( ABSPATH . wp_parse_url( $image, PHP_URL_PATH ) );
-		$image_info = wp_check_filetype( $image_path );
-
-		$imagesizes = getimagesize( $image_path );
-		if ( is_array( $imagesizes ) ) {
-			$image_width  = $imagesizes[0];
-			$image_height = $imagesizes[1];
+		$image_info   = array();
+		$image_width  = $image_size;
+		$image_height = $image_size;
+		if ( false === strpos( $image, 'gravatar.com' ) ) {
+			// Ignore Gravatar image here and handler a real image.
+			$image      = current( explode( '?', $image ) ); // strip $_GET attributes from photo URL.
+			$image_path = wp_normalize_path( ABSPATH . wp_parse_url( $image, PHP_URL_PATH ) );
+			$image_info = wp_check_filetype( $image_path );
+			$imagesizes = getimagesize( $image_path );
+			if ( is_array( $imagesizes ) ) {
+				list( $image_width, $image_height ) = $imagesizes;
+			}
 		} else {
-			$image_width  = $image_size;
-			$image_height = $image_size;
+			// Gravatar image.
+			$image_path = esc_url_raw( $image );
 		}
 
 		$person = array(
-			'@context'     => 'https://schema.org',
-			'@type'        => 'ProfilePage',
-			'dateCreated'  => um_user( 'user_registered' ),
-			'mainEntity'   => array(
+			'@context'    => 'https://schema.org',
+			'@type'       => 'ProfilePage',
+			'dateCreated' => um_user( 'user_registered' ),
+			'mainEntity'  => array(
 				'@type'         => 'Person',
 				'name'          => esc_attr( $title ),
 				'alternateName' => um_user( 'user_login' ),
@@ -762,6 +766,7 @@ function um_profile_dynamic_meta_desc() {
 				),
 			),
 		);
+
 		$user_last_update = um_user( 'last_update' );
 		if ( ! empty( $user_last_update ) ) {
 			if ( is_numeric( $user_last_update ) ) {
@@ -813,7 +818,7 @@ function um_profile_dynamic_meta_desc() {
 		<?php if ( is_ssl() ) { ?>
 			<meta property="og:image:secure_url" content="<?php echo esc_url( $image ); ?>"/>
 		<?php } ?>
-		<?php if ( $image_info['type'] ) { ?>
+		<?php if ( ! empty( $image_info['type'] ) ) { ?>
 			<meta property="og:image:type" content="<?php echo esc_attr( $image_info['type'] ); ?>" />
 		<?php } ?>
 		<meta property="og:url" content="<?php echo esc_url( $url ); ?>"/>

includes/frontend/class-enqueue.php

@@ -144,18 +144,6 @@ final class Enqueue extends \um\common\Enqueue {
 		$localize_data = apply_filters( 'um_enqueue_localize_data', $localize_data );
 		wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
 
-		// Makes the honeypot.
-		if ( ! empty( UM()->fields()->set_mode ) && ( 'profile' !== UM()->fields()->set_mode || true === UM()->fields()->editing ) ) {
-			ob_start();
-			?>
-			jQuery( window ).on( 'load', function() {
-				jQuery('input[name="<?php echo esc_js( UM()->honeypot ); ?>"]').val('');
-			});
-			<?php
-			$inline_script = ob_get_clean();
-			wp_add_inline_script( 'um_scripts', $inline_script );
-		}
-
 		wp_register_script( 'um_dropdown', $js_url . 'dropdown' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
 
 		wp_register_script( 'um_members', $js_url . 'um-members' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), UM_VERSION, true );
@@ -206,18 +194,6 @@ final class Enqueue extends \um\common\Enqueue {
 		$deps = array_merge( array( 'um_ui', 'um_tipsy', 'um_raty', 'select2', 'um_fileupload', 'um_common', 'um_responsive', 'um_modal' ), self::$fonticons_handlers );
 		wp_register_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', $deps, UM_VERSION );
 
-		// Makes the honeypot invisible.
-		if ( ! empty( UM()->fields()->set_mode ) && ( 'profile' !== UM()->fields()->set_mode || true === UM()->fields()->editing ) ) {
-			ob_start();
-			?>
-			.<?php echo esc_attr( UM()->honeypot ); ?>_name {
-				display: none !important;
-			}
-			<?php
-			$inline_styles = ob_get_clean();
-			wp_add_inline_style( 'um_styles', $inline_styles );
-		}
-
 		wp_register_style( 'um_members', $css_url . 'um-members' . $suffix . '.css', array( 'um_styles' ), UM_VERSION );
 		// RTL styles.
 		if ( is_rtl() ) {

readme.txt

@@ -167,7 +167,7 @@ No specific extensions are needed. But we highly recommended keep active these P
 
 IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION
 
-= 2.10.0 2025-02-17 =
+= 2.10.0 2025-02-18 =
 
 **Enhancements**