Changeset 13548

Timestamp:

04/17/2024 06:10:21 AM (6 months ago)

Author:

dd32

Message:

Support Forums: Blocks: When editing a reply/thread that was created pre-block editor, but now has a block editor, load the block editor upon save.

This fixes edits of old reviews showing block HTML, as old reviews can be edited in the new block editor.

See #6608, #7593.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-blocks.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-blocks.php

@@ -277 +277 @@
 
         if ( $use_it ) {
-            $reply_id = bbp_is_reply_edit() ? bbp_get_reply_id() : ( ( bbp_is_post_request() && ! empty( $_POST['action'] ) && 'bbp-edit-reply' === $_POST['action'] ) ? $_POST['bbp_reply_id'] : 0 );
-            $topic_id = bbp_is_topic_edit() ? bbp_get_topic_id() : ( ( bbp_is_post_request() && ! empty( $_POST['action'] ) && 'bbp-edit-topic' === $_POST['action'] ) ? $_POST['bbp_topic_id'] : 0 );
-
-            // If we're editing a post made without the editor, let's respect that.
-            if ( $reply_id ) {
-                $reply = bbp_get_reply( $reply_id );
-
-                if ( $reply && ! has_blocks( $reply->post_content ) ) {
-                    $use_it = false;
-                }
-            } elseif ( $topic_id ) {
-                if ( ! has_blocks( get_post_field( 'post_content', $topic_id ) ) ) {
+            $content = false;
+
+            if ( bbp_is_reply_edit() ) {
+                $content = bbp_get_reply( bbp_get_reply_id() )->post_content;
+            } elseif ( bbp_is_topic_edit() ) {
+                $content = get_post_field( 'post_content', bbp_get_topic_id() );
+            } elseif ( 'bbp-edit-reply' === $_POST['action'] ?? '' ) {
+                $content = wp_unslash( $_POST['bbp_reply_content'] ?? '' ) ?: bbp_get_reply( $_POST['bbp_reply_id'] ?? 0 )->post_content;
+            } elseif ( 'bbp-edit-topic' === $_POST['action'] ?? '' ) {
+                $content = wp_unslash( $_POST['bbp_topic_content'] ?? '' ) ?: get_post_field( 'post_content', $_POST['bbp_topic_id'] );
+            }
+
+            if ( $content ) {
+                // Similar to has_blocks(), but optimized for forum use.
+                $content = trim( $content );
+                if ( ! str_starts_with( $content, '<!-- wp:' ) || ! str_ends_with( $content, '-->' ) ) {
                     $use_it = false;
                 }