Sharing: be more defensive in sharing output to avoid warnings

Fixes #40338
Automattic · Nov 26, 2024 · 9498f26 · 9498f26
1 parent f55374c
commit 9498f26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-sharing-module-warning b/projects/plugins/jetpack/changelog/fix-sharing-module-warning
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Sharing: avoid PHP warnings when customizing the output of the sharing buttons.
diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharing-service.php b/projects/plugins/jetpack/modules/sharedaddy/sharing-service.php
@@ -1241,6 +1241,10 @@ function_exists( '\Activitypub\is_activitypub_request' )
 	 */
 	$sharing_markup = apply_filters( 'jetpack_sharing_display_markup', $sharing_content, $enabled );
 
+	if ( ! is_string( $sharing_markup ) || ! is_string( $text ) ) {
+		return $text;
+	}
+	l( $text, $sharing_markup );
 	if ( $echo ) {
 		echo $text . $sharing_markup; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	} else {