Changeset 12345

Timestamp:

12/19/2022 05:08:34 AM (4 years ago)

Author:

dd32

Message:

Support Forums: Blocks: Don't treat a non-block post as a block post during edit.

During the bbPress edit topic/reply POST submission, bbp_is_reply_edit() and bbp_is_topic_edit() are not truthful.

See ​https://github.com/Automattic/blocks-everywhere/pull/120.
See #6608.

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

@@ -268 +268 @@
                 $use_it            = ( $enabled_for_user && $enabled_for_forum );
 
-                // If we're editing a post made without the editor, let's respect that.
-                if ( $use_it && bbp_is_reply_edit() ) {
-                        $reply = bbp_get_reply( bbp_get_reply_id() );
-
-                        if ( $reply && ! has_blocks( $reply->post_content ) ) {
-                                $use_it = false;
-                        }
-                } elseif ( $use_it && bbp_is_topic_edit() ) {
-                        if ( ! has_blocks( get_post_field( 'post_content', bbp_get_topic_id() ) ) ) {
-                                $use_it = false;
+                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 ) ) ) {
+                                        $use_it = false;
+                                }
                         }
                 }