Changeset 5408

Timestamp:

06/16/2014 08:45:38 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Abstract new topic-transition reply helper-functions onto action hooks for easier testing and replacement/extension by third party plugins. See #2494.

Location:

trunk/src/includes

Files:

• core/actions.php (modified) (1 diff)
• topics/functions.php (modified) (16 diffs)

trunk/src/includes/core/actions.php

@@ -263 +263 @@
 add_action( 'bbp_spam_reply',    'bbp_decrease_user_reply_count' );
 
+// Topic status transition helpers for replies
+add_action( 'bbp_trash_topic',   'bbp_trash_topic_replies'   );
+add_action( 'bbp_untrash_topic', 'bbp_untrash_topic_replies' );
+add_action( 'bbp_delete_topic',  'bbp_delete_topic_replies'  );
+add_action( 'bbp_spam_topic',    'bbp_spam_topic_replies'    );
+add_action( 'bbp_unspam_topic', ' bbp_unspam_topic_replies'  );
+
 // User status
 // @todo make these sub-actions

trunk/src/includes/topics/functions.php

@@ -2772 +2772 @@
     }
 
-    // Bail if already open
+    // Bail if not closed
     if ( bbp_get_closed_status_id() !== $topic->post_status ) {
         return false;
@@ -2781 +2781 @@
 
     // Get previous status
-    $topic_status       = get_post_meta( $topic_id, '_bbp_status', true );
+    $topic_status = get_post_meta( $topic_id, '_bbp_status', true );
+
+    // If no previous status, default to publish
+    if ( empty( $topic_status ) ) {
+        $topic_status = bbp_get_public_status_id();
+    }
 
     // Set previous status
@@ -2834 +2839 @@
     do_action( 'bbp_spam_topic', $topic_id );
 
-    // Trash replies to the topic
-    bbp_spam_topic_replies();
-
     // Set post status to spam
     $topic->post_status = bbp_get_spam_status_id();
 
     // Empty the topic of its tags
-    $topic->tax_input = bbp_spam_topic_tags();
+    $topic->tax_input = bbp_spam_topic_tags( $topic_id );
 
     // No revisions
@@ -2971 +2973 @@
     // Execute pre unspam code
     do_action( 'bbp_unspam_topic', $topic_id );
-
-    // Untrash the replies to a previously spammed topic
-    bbp_unspam_topic_replies();
 
     // Get pre spam status
@@ -3079 +3078 @@
  */
 function bbp_stick_topic( $topic_id = 0, $super = false ) {
+
+    // Validation
     $topic_id = bbp_get_topic_id( $topic_id );
 
     // Bail if a topic is not a topic (prevents revisions as stickies)
-    if ( ! bbp_is_topic( $topic_id ) )
+    if ( ! bbp_is_topic( $topic_id ) ) {
         return false;
+    }
 
     // We may have a super sticky to which we want to convert into a normal
@@ -3114 +3116 @@
     $success  = !empty( $super ) ? update_option( '_bbp_super_sticky_topics', $stickies ) : update_post_meta( $forum_id, '_bbp_sticky_topics', $stickies );
 
-    do_action( 'bbp_sticked_topic', $topic_id, $super, $success );
+    do_action( 'bbp_stuck_topic', $topic_id, $super, $success );
 
     return (bool) $success;
@@ -3134 +3136 @@
  * @uses delete_post_meta() To delete the forum stickies meta
  * @uses update_post_meta() To update the forum stickies meta
- * @uses do_action() Calls 'bbp_unsticked_topic' with the topic id and success
+ * @uses do_action() Calls 'bbp_unstuck_topic' with the topic id and success
  * @return bool Always true.
  */
@@ -3161 +3163 @@
     }
 
-    do_action( 'bbp_unsticked_topic', $topic_id, $success );
+    do_action( 'bbp_unstuck_topic', $topic_id, $success );
 
     return (bool) $success;
@@ -3189 +3191 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) ) {
+    if ( empty( $topic_id ) || ! bbp_is_topic( $topic_id ) ) {
         return false;
     }
 
     do_action( 'bbp_delete_topic', $topic_id );
-
-    bbp_delete_topic_replies( $topic_id );
 }
 
@@ -3253 +3253 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) ) {
+    if ( empty( $topic_id ) || ! bbp_is_topic( $topic_id ) ) {
         return false;
     }
 
     do_action( 'bbp_trash_topic', $topic_id );
-
-    bbp_trash_topic_replies( $topic_id );
 }
 
@@ -3326 +3324 @@
 
     do_action( 'bbp_untrash_topic', $topic_id );
-
-    bbp_untrash_topic_replies( $topic_id );
 }
 
@@ -3373 +3369 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
+    if ( empty( $topic_id ) || ! bbp_is_topic( $topic_id ) ) {
         return false;
+    }
 
     do_action( 'bbp_deleted_topic', $topic_id );
@@ -3389 +3386 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
+    if ( empty( $topic_id ) || ! bbp_is_topic( $topic_id ) ) {
         return false;
+    }
 
     do_action( 'bbp_trashed_topic', $topic_id );
@@ -3405 +3403 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
+    if ( empty( $topic_id ) || ! bbp_is_topic( $topic_id ) ) {
         return false;
+    }
 
     do_action( 'bbp_untrashed_topic', $topic_id );
@@ -3617 +3616 @@
 
     // Bail if not editing a topic
-    if ( !bbp_is_topic_edit() )
+    if ( ! bbp_is_topic_edit() ) {
         return;
+    }
 
     // User cannot edit topic, so redirect back to topic
@@ -3641 +3641 @@
 
     // Bail if not editing a topic tag
-    if ( !bbp_is_topic_tag_edit() )
+    if ( ! bbp_is_topic_tag_edit() ) {
         return;
+    }
 
     // Bail if current user cannot edit topic tags