Changeset 4426

Timestamp:

11/16/2012 02:07:37 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Revisions:

• Since we do our own revision handling, turn off revisions for the initial call to wp_update_post() in topics and replies.
• We check if the post type supports revisions, and toggle them off and back on to avoid duplicate revisions from specifically saving it later in the edit process.
• Fixes #2029.

Location:

trunk/includes

Files:

• replies/functions.php (modified) (4 diffs)
• topics/functions.php (modified) (3 diffs)

trunk/includes/replies/functions.php

@@ -365 +365 @@
  * @uses bbp_has_errors() To get the {@link WP_Error} errors
  * @uses wp_save_post_revision() To save a reply revision
- * @uses bbp_update_topic_revision_log() To update the reply revision log
+ * @uses bbp_update_reply_revision_log() To update the reply revision log
  * @uses wp_update_post() To update the reply
  * @uses bbp_get_reply_topic_id() To get the reply topic id
@@ -387 +387 @@
 
     // Define local variable(s)
+    $revisions_removed = false;
     $reply = $reply_id = $reply_author = $topic_id = $forum_id = $anonymous_data = 0;
     $reply_title = $reply_content = $reply_edit_reason = $terms = '';
@@ -548 +549 @@
     ) );
 
-    // Insert reply
+    // Toggle revisions to avoid duplicates
+    if ( post_type_supports( bbp_get_topic_post_type(), 'revisions' ) ) {
+        $revisions_removed = true;
+        remove_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+    }
+
+    // Insert topic
     $reply_id = wp_update_post( $reply_data );
+
+    // Toggle revisions back on
+    if ( true === $revisions_removed ) {
+        $revisions_removed = true;
+        add_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+    }
 
     /** Topic Tags ************************************************************/
@@ -572 +585 @@
     // Update revision log
     if ( !empty( $_POST['bbp_log_reply_edit'] ) && ( 1 == $_POST['bbp_log_reply_edit'] ) ) {
-        $revision_id = wp_save_post_revision( $reply_id );
+        $revision_id = wp_is_post_revision( $reply_id );
         if ( !empty( $revision_id ) ) {
             bbp_update_reply_revision_log( array(

trunk/includes/topics/functions.php

@@ -434 +434 @@
 
     // Define local variable(s)
+    $revisions_removed = false;
     $topic = $topic_id = $topic_author = $forum_id = $anonymous_data = 0;
     $topic_title = $topic_content = $topic_edit_reason = '';
@@ -614 +615 @@
     ) );
 
+    // Toggle revisions to avoid duplicates
+    if ( post_type_supports( bbp_get_topic_post_type(), 'revisions' ) ) {
+        $revisions_removed = true;
+        remove_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+    }
+
     // Insert topic
     $topic_id = wp_update_post( $topic_data );
+
+    // Toggle revisions back on
+    if ( true === $revisions_removed ) {
+        $revisions_removed = true;
+        add_post_type_support( bbp_get_topic_post_type(), 'revisions' );
+    }
 
     /** Stickies **************************************************************/
@@ -649 +662 @@
 
     // Update revision log
-    if ( !empty( $_POST['bbp_log_topic_edit'] ) && ( 1 == $_POST['bbp_log_topic_edit'] ) && ( $revision_id = wp_save_post_revision( $topic_id ) ) ) {
-        bbp_update_topic_revision_log( array(
-            'topic_id'    => $topic_id,
-            'revision_id' => $revision_id,
-            'author_id'   => bbp_get_current_user_id(),
-            'reason'      => $topic_edit_reason
-        ) );
+    if ( !empty( $_POST['bbp_log_topic_edit'] ) && ( 1 == $_POST['bbp_log_topic_edit'] ) )  {
+        $revision_id = wp_save_post_revision( $topic_id );
+        if ( ! empty( $revision_id ) ) {
+            bbp_update_topic_revision_log( array(
+                'topic_id'    => $topic_id,
+                'revision_id' => $revision_id,
+                'author_id'   => bbp_get_current_user_id(),
+                'reason'      => $topic_edit_reason
+            ) );
+        }
     }