Changeset 4782

Timestamp:

02/28/2013 02:59:33 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Move new topic sticky-check after 'bbp_new_topic' action, to ensure forum ID meta is saved via bbp_update_topic(). Also move sticky-check in edit-topic handler, so correct forum ID is used when moving a sticky topic. Props imath. Fixes #2230.

File:

• trunk/includes/topics/functions.php (modified) (4 diffs)

trunk/includes/topics/functions.php

@@ -297 +297 @@
     if ( !empty( $topic_id ) && !is_wp_error( $topic_id ) ) {
 
+        /** Trash Check *******************************************************/
+
+        // If the forum is trash, or the topic_status is switched to
+        // trash, trash it properly
+        if ( ( get_post_field( 'post_status', $forum_id ) == bbp_get_trash_status_id() ) || ( $topic_data['post_status'] == bbp_get_trash_status_id() ) ) {
+
+            // Trash the reply
+            wp_trash_post( $topic_id );
+
+            // Force view=all
+            $view_all = true;
+        }
+
+        /** Spam Check ********************************************************/
+
+        // If reply or topic are spam, officially spam this reply
+        if ( $topic_data['post_status'] == bbp_get_spam_status_id() ) {
+            add_post_meta( $topic_id, '_bbp_spam_meta_status', bbp_get_public_status_id() );
+
+            // Force view=all
+            $view_all = true;
+        }
+
+        /** Update counts, etc... *********************************************/
+
+        do_action( 'bbp_new_topic', $topic_id, $forum_id, $anonymous_data, $topic_author );
+
         /** Stickies **********************************************************/
 
+        // Sticky check after 'bbp_new_topic' action so forum ID meta is set
         if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
 
@@ -320 +348 @@
             }
         }
-
-        /** Trash Check *******************************************************/
-
-        // If the forum is trash, or the topic_status is switched to
-        // trash, trash it properly
-        if ( ( get_post_field( 'post_status', $forum_id ) == bbp_get_trash_status_id() ) || ( $topic_data['post_status'] == bbp_get_trash_status_id() ) ) {
-
-            // Trash the reply
-            wp_trash_post( $topic_id );
-
-            // Force view=all
-            $view_all = true;
-        }
-
-        /** Spam Check ********************************************************/
-
-        // If reply or topic are spam, officially spam this reply
-        if ( $topic_data['post_status'] == bbp_get_spam_status_id() ) {
-            add_post_meta( $topic_id, '_bbp_spam_meta_status', bbp_get_public_status_id() );
-
-            // Force view=all
-            $view_all = true;
-        }
-
-        /** Update counts, etc... *********************************************/
-
-        do_action( 'bbp_new_topic', $topic_id, $forum_id, $anonymous_data, $topic_author );
 
         /** Additional Actions (After Save) ***********************************/
@@ -639 +640 @@
     }
 
-    /** 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 *************************************************************/
-
-    // Revision Reason
-    if ( !empty( $_POST['bbp_topic_edit_reason'] ) )
-        $topic_edit_reason = esc_attr( strip_tags( $_POST['bbp_topic_edit_reason'] ) );
-
-    // Update revision log
-    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
-            ) );
-        }
-    }
-
     /** No Errors *************************************************************/
 
@@ -689 +646 @@
         // Update counts, etc...
         do_action( 'bbp_edit_topic', $topic_id, $forum_id, $anonymous_data, $topic_author , true /* Is edit */ );
+
+        /** Revisions *********************************************************/
+
+        // Revision Reason
+        if ( !empty( $_POST['bbp_topic_edit_reason'] ) ) {
+            $topic_edit_reason = esc_attr( strip_tags( $_POST['bbp_topic_edit_reason'] ) );
+        }
+
+        // Update revision log
+        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
+                ) );
+            }
+        }
+
+        /** Move Topic ********************************************************/
 
         // If the new forum id is not equal to the old forum id, run the
         // bbp_move_topic action and pass the topic's forum id as the
         // first arg and topic id as the second to update counts.
-        if ( $forum_id != $topic->post_parent )
+        if ( $forum_id != $topic->post_parent ) {
             bbp_move_topic_handler( $topic_id, $topic->post_parent, $forum_id );
+        }
+
+        /** 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;
+            }
+        }
 
         /** Additional Actions (After Save) ***********************************/