Changeset 6341

Timestamp:

03/02/2017 04:46:00 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderation: Use the appropriate _edit_ post meta when editing a forum/topic/reply.

This first pass does not introduce any theme-side edit-locking interface, but it will warn any user within wp-admin if another user is editing something theme-side.

See #3073.

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/common/locks.php (added)
• includes/core/theme-compat.php (modified) (3 diffs)
• includes/forums/functions.php (modified) (2 diffs)
• includes/replies/functions.php (modified) (3 diffs)
• includes/topics/functions.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -334 +334 @@
         require $this->includes_dir . 'common/formatting.php';
         require $this->includes_dir . 'common/locale.php';
+        require $this->includes_dir . 'common/locks.php';
         require $this->includes_dir . 'common/template.php';
         require $this->includes_dir . 'common/widgets.php';

trunk/src/includes/core/theme-compat.php

@@ -578 +578 @@
         ) );
 
+        // Lock the forum from other edits
+        bbp_set_post_lock( bbp_get_forum_id() );
+
     } elseif ( bbp_is_single_forum() ) {
 
@@ -644 +647 @@
 
         // Edit
-        } elseif ( bbp_is_topic_edit() ) {
+        } elseif ( bbp_is_topic_edit() ) {          
             $new_content = $bbp_shortcodes->display_topic_form();
+
+            // Lock the topic from other edits
+            bbp_set_post_lock( bbp_get_topic_id() );
 
         // Single
@@ -694 +700 @@
             $new_content = $bbp_shortcodes->display_reply_form();
 
+            // Lock the topic from other edits
+            bbp_set_post_lock( bbp_get_reply_id() );
+
         // Single
         } else {

trunk/src/includes/forums/functions.php

@@ -528 +528 @@
     $forum_id = wp_update_post( $forum_data );
 
-    /** Revisions *************************************************************/
-
-    /**
-     * @todo omitted for 2.1
-    // Revision Reason
-    if ( ! empty( $_POST['bbp_forum_edit_reason'] ) )
-        $forum_edit_reason = sanitize_text_field( $_POST['bbp_forum_edit_reason'] );
-
-    // Update revision log
-    if ( ! empty( $_POST['bbp_log_forum_edit'] ) && ( "1" === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
-        bbp_update_forum_revision_log( array(
-            'forum_id'    => $forum_id,
-            'revision_id' => $revision_id,
-            'author_id'   => bbp_get_current_user_id(),
-            'reason'      => $forum_edit_reason
-        ) );
-    }
-     */
-
     /** No Errors *************************************************************/
 
@@ -563 +544 @@
         ) );
 
+        /** Revisions *********************************************************/
+
+        // Update locks
+        update_post_meta( $forum_id, '_edit_last', bbp_get_current_user_id() );
+        delete_post_meta( $forum_id, '_edit_lock' );
+
+        /**
+         * @todo omitted for now
+        // Revision Reason
+        if ( ! empty( $_POST['bbp_forum_edit_reason'] ) )
+            $forum_edit_reason = sanitize_text_field( $_POST['bbp_forum_edit_reason'] );
+
+        // Update revision log
+        if ( ! empty( $_POST['bbp_log_forum_edit'] ) && ( "1" === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
+            bbp_update_forum_revision_log( array(
+                'forum_id'    => $forum_id,
+                'revision_id' => $revision_id,
+                'author_id'   => bbp_get_current_user_id(),
+                'reason'      => $forum_edit_reason
+            ) );
+        }
+
         // If the new forum parent id is not equal to the old forum parent
         // id, run the bbp_move_forum action and pass the forum's parent id
-        // as the first arg and new forum parent id as the second.
+        // as the first argument and new forum parent id as the second.
         // @todo implement
-        //if ( $forum_id !== $forum->post_parent )
-        //  bbp_move_forum_handler( $forum_parent_id, $forum->post_parent, $forum_id );
+        if ( $forum_id !== $forum->post_parent ) {
+            bbp_move_forum_handler( $forum_parent_id, $forum->post_parent, $forum_id );
+        }
+
+        */
 
         /** Additional Actions (After Save) ***********************************/

trunk/src/includes/replies/functions.php

@@ -728 +728 @@
     }
 
-    // Insert topic
+    // Insert reply
     $reply_id = wp_update_post( $reply_data );
 
@@ -750 +750 @@
     }
 
-    /** Revisions *************************************************************/
-
-    // Revision Reason
-    if ( ! empty( $_POST['bbp_reply_edit_reason'] ) ) {
-        $reply_edit_reason = sanitize_text_field( $_POST['bbp_reply_edit_reason'] );
-    }
-
-    // Update revision log
-    if ( ! empty( $_POST['bbp_log_reply_edit'] ) && ( "1" === $_POST['bbp_log_reply_edit'] ) ) {
-        $revision_id = wp_save_post_revision( $reply_id );
-        if ( ! empty( $revision_id ) ) {
-            bbp_update_reply_revision_log( array(
-                'reply_id'    => $reply_id,
-                'revision_id' => $revision_id,
-                'author_id'   => bbp_get_current_user_id(),
-                'reason'      => $reply_edit_reason
-            ) );
-        }
-    }
-
     /** No Errors *************************************************************/
 
@@ -776 +756 @@
         // Update counts, etc...
         do_action( 'bbp_edit_reply', $reply_id, $topic_id, $forum_id, $anonymous_data, $reply_author , true, $reply_to );
+
+        /** Revisions *********************************************************/
+
+        // Update locks
+        update_post_meta( $reply_id, '_edit_last', bbp_get_current_user_id() );
+        delete_post_meta( $reply_id, '_edit_lock' );
+
+        // Revision Reason
+        if ( ! empty( $_POST['bbp_reply_edit_reason'] ) ) {
+            $reply_edit_reason = sanitize_text_field( $_POST['bbp_reply_edit_reason'] );
+        }
+
+        // Update revision log
+        if ( ! empty( $_POST['bbp_log_reply_edit'] ) && ( "1" === $_POST['bbp_log_reply_edit'] ) ) {
+            $revision_id = wp_save_post_revision( $reply_id );
+            if ( ! empty( $revision_id ) ) {
+                bbp_update_reply_revision_log( array(
+                    'reply_id'    => $reply_id,
+                    'revision_id' => $revision_id,
+                    'author_id'   => bbp_get_current_user_id(),
+                    'reason'      => $reply_edit_reason
+                ) );
+            }
+        }
 
         /** Additional Actions (After Save) ***********************************/

trunk/src/includes/topics/functions.php

@@ -705 +705 @@
         /** Revisions *********************************************************/
 
+        // Update locks
+        update_post_meta( $topic_id, '_edit_last', bbp_get_current_user_id() );
+        delete_post_meta( $topic_id, '_edit_lock' );
+
         // Revision Reason
         if ( ! empty( $_POST['bbp_topic_edit_reason'] ) ) {