Changeset 6401

Timestamp:

04/20/2017 04:36:57 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Stickies: Update forum/topic meta early in bbp_update_topic()

• Makes meta-data available earlier for downstream functions
• Removes ineffective assumption of forum-topic-id when empty

This fixes a situation where trying to stick a new topic to a forum would look for the _bbp_forum_id meta-data before it was updated.

Fixes #3103.

File:

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

trunk/src/includes/topics/functions.php

@@ -811 +811 @@
     }
 
-    // Check forum_id
-    if ( empty( $forum_id ) ) {
-        $forum_id = bbp_get_topic_forum_id( $topic_id );
-    }
+    // Forum/Topic meta (early, for use in downstream functions)
+    bbp_update_topic_forum_id( $topic_id, $forum_id );
+    bbp_update_topic_topic_id( $topic_id, $topic_id );
 
     // Get the topic types
@@ -820 +819 @@
 
     // 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_keys( $topic_types ) ) ) {
+    if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( $topic_types ), true ) ) {
 
         // What's the caps?
@@ -866 +865 @@
     if ( bbp_is_subscriptions_active() && ! empty( $author_id ) ) {
         $subscribed = bbp_is_user_subscribed( $author_id, $topic_id );
-        $subscheck  = ( ! empty( $_POST['bbp_topic_subscription'] ) && ( 'bbp_subscribe' === $_POST['bbp_topic_subscription'] ) ) ? true : false;
+        $subscheck  = ( ! empty( $_POST['bbp_topic_subscription'] ) && ( 'bbp_subscribe' === $_POST['bbp_topic_subscription'] ) )
+            ? true
+            : false;
 
         // Subscribed and unsubscribing
@@ -877 +878 @@
         }
     }
-
-    // Forum topic meta
-    bbp_update_topic_forum_id( $topic_id, $forum_id );
-    bbp_update_topic_topic_id( $topic_id, $topic_id );
 
     // Update associated topic values if this is a new topic
@@ -2081 +2078 @@
  */
 function bbp_get_stickies( $forum_id = 0 ) {
-    $stickies = empty( $forum_id ) ? bbp_get_super_stickies() : get_post_meta( $forum_id, '_bbp_sticky_topics', true );
-    $stickies = ( empty( $stickies ) || ! is_array( $stickies ) ) ? array() : $stickies;
-
-    return apply_filters( 'bbp_get_stickies', $stickies, $forum_id );
+
+    // Get stickies (maybe super if empty)
+    $stickies = empty( $forum_id )
+        ? bbp_get_super_stickies()
+        : get_post_meta( $forum_id, '_bbp_sticky_topics', true );
+
+    // Cast as array
+    $stickies = ( empty( $stickies ) || ! is_array( $stickies ) )
+        ? array()
+        : $stickies;
+
+    // Filter and return
+    return (array) apply_filters( 'bbp_get_stickies', $stickies, $forum_id );
 }
 
@@ -2097 +2103 @@
  */
 function bbp_get_super_stickies() {
+
+    // Get super stickies
     $stickies = get_option( '_bbp_super_sticky_topics', array() );
-    $stickies = ( empty( $stickies ) || ! is_array( $stickies ) ) ? array() : $stickies;
-
-    return apply_filters( 'bbp_get_super_stickies', $stickies );
+
+    // Cast as array
+    $stickies = ( empty( $stickies ) || ! is_array( $stickies ) )
+        ? array()
+        : $stickies;
+
+    // Filter and return
+    return (array) apply_filters( 'bbp_get_super_stickies', $stickies );
 }