Changeset 4042 for branches/plugin/bbp-includes/bbp-topic-functions.php

Timestamp:

07/02/2012 12:39:16 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Akismet:

• Pass additional post information on topic/reply edit, to prevent Akismet from nooping it.
• Revert part of r4041; put actions back before bbp_is_error() calls.
• Replace some missing revision numbers.
• Fixes #1869.

File:

• branches/plugin/bbp-includes/bbp-topic-functions.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -259 +259 @@
     }
 
+    /** Additional Actions (Before Save) **************************************/
+
+    do_action( 'bbp_new_topic_pre_extras', $forum_id );
+
     // Bail if errors
     if ( bbp_has_errors() )
@@ -264 +268 @@
 
     /** No Errors *************************************************************/
-
-    do_action( 'bbp_new_topic_pre_extras', $forum_id );
 
     // Add the content of the form to $topic_data as an array.
@@ -574 +576 @@
     /** No Errors *************************************************************/
 
-    /** Stickies **********************************************************/
-
-    if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
-
-        // What's the dilly?
-        switch ( $_POST['bbp_stick_topic'] ) {
-
-            // Sticky in forum
-            case 'stick'   :
-                bbp_stick_topic( $topic_id );
-                break;
-
-            // Sticky in all forums
-            case 'super'   :
-                bbp_stick_topic( $topic_id, true );
-                break;
-
-            // Normal
-            case 'unstick' :
-            default        :
-                bbp_unstick_topic( $topic_id );
-                break;
-        }
-    }
-
-    /** Update the topic ******************************************************/
-
     // Add the content of the form to $topic_data as an array
     // Just in time manipulation of topic data before being edited
@@ -609 +584 @@
         'post_status'  => $post_status,
         'post_parent'  => $forum_id,
+        'post_author'  => $topic->post_author,
+        'post_type'    => bbp_get_topic_post_type(),
         'tax_input'    => $terms,
     ) );
@@ -614 +591 @@
     // Insert topic
     $topic_id = wp_update_post( $topic_data );
+
+    /** Stickies **************************************************************/
+
+    if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
+
+        // What's the dilly?
+        switch ( $_POST['bbp_stick_topic'] ) {
+
+            // Sticky in forum
+            case 'stick'   :
+                bbp_stick_topic( $topic_id );
+                break;
+
+            // Sticky in all forums
+            case 'super'   :
+                bbp_stick_topic( $topic_id, true );
+                break;
+
+            // Normal
+            case 'unstick' :
+            default        :
+                bbp_unstick_topic( $topic_id );
+                break;
+        }
+    }
 
     /** Revisions *************************************************************/