Changeset 13635

Timestamp:

05/01/2024 12:38:08 AM ( 3 weeks ago)

Author:

dd32

Message:

Support Forums: Don't apply the <li> improper HTML fixes to block content.

With support forum posts being written with the block editor, invalid HTML is much less likely now.

This tries removing the list item fixes from block posts.

See #20 .
Fixes #7618 .

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub

Files:

• wporg-support-2024/functions.php (modified) ( 2 diffs )
• wporg-support/functions.php (modified) ( 2 diffs )

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php

@@ -one thousand two hundred and one +one thousand two hundred and one @@
   */
  function wporg_support_wrap_standalone_li_tags_in_ul( $content ) {
+     remove_filter( current_filter(), 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+
      // No lists?  No worries.
      if ( false === stripos( $content, '<li>' ) ) {
@@ -one thousand two hundred and fifty-one +one thousand two hundred and fifty-three @@
      return $content;
  }
- add_filter( 'bbp_get_topic_content', 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
- add_filter( 'bbp_get_reply_content', 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+
+ /**
+  * Maybe wrap standalone <li> tags in <ul> tags.
+  * This only wraps non-block-posts.
+  *
+  * @see  https://meta.trac.wordpress.org/ticket/7618
+  */
+ function wporg_support_maybe_wrap_standalone_li_tags_in_ul( $content ) {
+     // If it's not a block post,  we'll need to filter it after all transforms.
+     if ( !  has_blocks( $content ) ) {
+         add_filter( current_filter(), 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+     }
+
+     return $content;
+ }
+ add_filter( 'bbp_get_topic_content', 'wporg_support_maybe_wrap_standalone_li_tags_in_ul', 1 );
+ add_filter( 'bbp_get_reply_content', 'wporg_support_maybe_wrap_standalone_li_tags_in_ul', 1 );
 
  /**

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -eight hundred and sixty-three +eight hundred and sixty-three @@
   */
  function wporg_support_wrap_standalone_li_tags_in_ul( $content ) {
+     remove_filter( current_filter(), 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+
      // No lists?  No worries.
      if ( false === stripos( $content, '<li>' ) ) {
@@ -nine hundred and thirteen +nine hundred and fifteen @@
      return $content;
  }
- add_filter( 'bbp_get_topic_content', 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
- add_filter( 'bbp_get_reply_content', 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+
+ /**
+  * Maybe wrap standalone <li> tags in <ul> tags.
+  * This only wraps non-block-posts.
+  *
+  * @see  https://meta.trac.wordpress.org/ticket/7618
+  */
+ function wporg_support_maybe_wrap_standalone_li_tags_in_ul( $content ) {
+     // If it's not a block post,  we'll need to filter it after all transforms.
+     if ( !  has_blocks( $content ) ) {
+         add_filter( current_filter(), 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
+     }
+
+     return $content;
+ }
+ add_filter( 'bbp_get_topic_content', 'wporg_support_maybe_wrap_standalone_li_tags_in_ul', 1 );
+ add_filter( 'bbp_get_reply_content', 'wporg_support_maybe_wrap_standalone_li_tags_in_ul', 1 );
 
  /**