Goodreads Block: Make sure we check for id attribute in the goodreads…

… block, when rendering (#39713) * Make sure we check for id attribute in the goodreads block, before attempting to use it for rendering as id of the div. * changelog
Automattic · Oct 10, 2024 · 90f7d63 · 90f7d63
1 parent 05de241
commit 90f7d63
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-missing-id-args-goodreads-block b/projects/plugins/jetpack/changelog/fix-missing-id-args-goodreads-block
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Fixed rendering of goodreads block when there is not id attribute so to not result in a PHP warning
diff --git a/projects/plugins/jetpack/extensions/blocks/goodreads/goodreads.php b/projects/plugins/jetpack/extensions/blocks/goodreads/goodreads.php
@@ -35,19 +35,27 @@ function register_block() {
 function load_assets( $attr ) {
 	Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
 
-	if ( isset( $attr['link'] ) && isset( $attr['id'] ) ) {
-		wp_enqueue_script(
-			'jetpack-goodreads-' . esc_attr( $attr['id'] ),
-			esc_url_raw( $attr['link'] ),
-			array(),
-			JETPACK__VERSION,
-			true
-		);
+	if ( isset( $attr['id'] ) ) {
+		if ( isset( $attr['link'] ) ) {
+			wp_enqueue_script(
+				'jetpack-goodreads-' . esc_attr( $attr['id'] ),
+				esc_url_raw( $attr['link'] ),
+				array(),
+				JETPACK__VERSION,
+				true
+			);
+		}
+
+		$id = esc_attr( $attr['id'] );
+	} else {
+		$id = '';
 	}
 
+	$classes = esc_attr( Blocks::classes( Blocks::get_block_feature( __DIR__ ), $attr ) );
+
 	return sprintf(
 		'<div id="%1$s" class="%2$s"></div>',
-		esc_attr( $attr['id'] ),
-		esc_attr( Blocks::classes( Blocks::get_block_feature( __DIR__ ), $attr ) )
+		$id,
+		$classes
 	);
 }