Changeset 7057 for trunk/src/includes/extend/buddypress/groups.php

Timestamp:

01/27/2020 11:36:04 PM (5 years ago)

Author:

johnjamesjacoby

Message:

BuddyPress: explicitly query for Group forum IDs, for topic parent dropdown.

This commit fixes an ambiguity regarding which forum IDs should/may appear when editing a Forum Topic inside a Group Forum. By being explicit here, a possible bug can be avoided where incorrect forum IDs could be listed.

Props imath. For 2.7, trunk.

File:

• trunk/src/includes/extend/buddypress/groups.php (modified) (4 diffs)

trunk/src/includes/extend/buddypress/groups.php

@@ -716 +716 @@
         $forum_ids = bbp_get_group_forum_ids( $group_id );
 
-        // Use the first forum ID
+        // Bail if no forum IDs available
         if ( empty( $forum_ids ) ) {
             return;
@@ -1164 +1164 @@
 
     /**
-     * Prevent Forum Parent from appearing
+     * Make Forum Parent a hidden field instead of a selectable one.
      *
      * @since 2.1.0 bbPress (r3746)
@@ -1177 +1177 @@
 
     /**
-     * Prevent Topic Parent from appearing
+     * Output a dropdown for picking which group forum this topic is for.
      *
      * @since 2.1.0 bbPress (r3746)
@@ -1183 +1183 @@
     public function topic_parent() {
 
-        $forum_ids = bbp_get_group_forum_ids( bp_get_current_group_id() ); ?>
+        // Get the group ID
+        $gid       = bp_get_current_group_id();
+
+        // Get the forum IDs for this group
+        $forum_ids = bbp_get_group_forum_ids( $gid );
+
+        // Attempt to get the current topic forum ID
+        $topic_id  = bbp_get_topic_id();
+        $forum_id  = bbp_get_topic_forum_id( $topic_id );
+
+        // Setup the query arguments - note that these may be overridden later
+        // by various bbPress visibility and capability filters.
+        $args = array(
+            'post_type'   => bbp_get_forum_post_type(),
+            'post_status' => bbp_get_public_status_id(),
+            'include'     => $forum_ids,
+            'numberposts' => -1,
+            'orderby'     => 'menu_order',
+            'order'       => 'ASC',
+        );
+
+        // Get the forum objects for these forum IDs
+        $forums = get_posts( $args );
+
+        // Setup the dropdown arguments
+        $dd_args = array(
+            'posts'    => $forums,
+            'selected' => $forum_id,
+        ); ?>
 
         <p>
             <label for="bbp_forum_id"><?php esc_html_e( 'Forum:', 'bbpress' ); ?></label><br />
-            <?php bbp_dropdown( array( 'include' => $forum_ids, 'selected' => bbp_get_form_topic_forum() ) ); ?>
+            <?php bbp_dropdown( $dd_args ); ?>
         </p>