From 80c9d3a9de6e4e0c01a1f636bb6d64ef03857336 Mon Sep 17 00:00:00 2001
From: dufresnesteven <steve.dufresne@automattic.com>
Date: Thu, 27 Oct 2022 20:16:23 +0900
Subject: [PATCH] Prefer the automatic related post component since titles are
 not controllable with blocks.

---
 .../themes/wporg-showcase-2022/functions.php   | 13 -------------
 .../patterns/subnav-bar.php                    | 18 ------------------
 .../wporg-showcase-2022/templates/page.html    |  2 +-
 .../wporg-showcase-2022/templates/single.html  |  1 -
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 source/wp-content/themes/wporg-showcase-2022/patterns/subnav-bar.php

diff --git a/source/wp-content/themes/wporg-showcase-2022/functions.php b/source/wp-content/themes/wporg-showcase-2022/functions.php
index ff57bbbd..e9933073 100644
--- a/source/wp-content/themes/wporg-showcase-2022/functions.php
+++ b/source/wp-content/themes/wporg-showcase-2022/functions.php
@@ -7,7 +7,6 @@
 
 // Filters and Actions
 add_filter( 'jetpack_images_get_images', __NAMESPACE__ . '\jetpack_fallback_image', 10, 3 );
-add_action( 'wp', __NAMESPACE__ . '\jetpackme_remove_rp', 20 );
 add_filter( 'jetpack_relatedposts_filter_thumbnail_size', __NAMESPACE__ . '\jetpackchange_image_size' );
 
 /**
@@ -79,18 +78,6 @@ function jetpack_fallback_image( $media, $post_id, $args ) {
 	}
 }
 
-/**
- * Filter JetPack Related Posts from content so we can control it via a block.
- */
-function jetpackme_remove_rp() {
-	if ( class_exists( 'Jetpack_RelatedPosts' ) ) {
-		$jprp = \Jetpack_RelatedPosts::init();
-		$callback = array( $jprp, 'filter_add_target_to_dom' );
-
-		remove_filter( 'the_content', $callback, 40 );
-	}
-}
-
 /**
  * Change JetPack Related Posts image size.
  */
diff --git a/source/wp-content/themes/wporg-showcase-2022/patterns/subnav-bar.php b/source/wp-content/themes/wporg-showcase-2022/patterns/subnav-bar.php
deleted file mode 100644
index 6b228f46..00000000
--- a/source/wp-content/themes/wporg-showcase-2022/patterns/subnav-bar.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Title: Subnav
- * Slug: wporg-showcase-2022/subnav-bar
- * Categories: wporg
- */
-
-?>
-
-<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"spacing":{"padding":{"top":"16px","right":"var:preset|spacing|20","bottom":"0","left":"var:preset|spacing|20"}}},"backgroundColor":"blueberry-1","textColor":"white","className":"is-style-brush-stroke","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull is-style-brush-stroke has-white-color has-blueberry-1-background-color has-text-color has-background has-link-color" style="padding-top:16px;padding-right:var(--wp--preset--spacing--20);padding-bottom:0;padding-left:var(--wp--preset--spacing--20)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignwide"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"normal"} -->
-<p class="has-normal-font-size" style="font-style:normal;font-weight:700"><?php esc_attr_e( 'Showcase', 'wporg' ); ?></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:navigation {"ref":7179,"backgroundColor":"blueberry-1","className":"is-style-dropdown-on-mobile","style":{"spacing":{"blockGap":"var:preset|spacing|30"}}} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-showcase-2022/templates/page.html b/source/wp-content/themes/wporg-showcase-2022/templates/page.html
index afba6d28..0001a90c 100644
--- a/source/wp-content/themes/wporg-showcase-2022/templates/page.html
+++ b/source/wp-content/themes/wporg-showcase-2022/templates/page.html
@@ -1,6 +1,6 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0px"}},"className":"entry-content","layout":{"type":"constrained"}} -->
+<!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0px"}},"className":"entry-content"} -->
 <main class="wp-block-group entry-content">
 	<!-- wp:post-content /-->
 </main>
diff --git a/source/wp-content/themes/wporg-showcase-2022/templates/single.html b/source/wp-content/themes/wporg-showcase-2022/templates/single.html
index bc623253..d43a7458 100644
--- a/source/wp-content/themes/wporg-showcase-2022/templates/single.html
+++ b/source/wp-content/themes/wporg-showcase-2022/templates/single.html
@@ -6,7 +6,6 @@
 	<!-- wp:post-title /-->
 	<!-- wp:post-content /-->
 	<!-- wp:post-terms {"term":"post_tag"} /-->
-	<!-- wp:pattern {"slug":"wporg-showcase-2022/related-posts"} /-->
 </main>
 <!-- /wp:group -->