Changeset 4716

Timestamp:

01/25/2013 05:09:47 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Map group forum meta caps directly to 'bbp_map_meta_caps' filter to avoid recursion. Also remove BuddyPress 'topic' action check, to allow single group-forum capability map to work correctly. Fixes #2140.

File:

• trunk/includes/extend/buddypress/group.php (modified) (2 diffs)

trunk/includes/extend/buddypress/group.php

@@ -112 +112 @@
 
         // Allow group member to view private/hidden forums
-        add_filter( 'bbp_map_topic_meta_caps',   array( $this, 'map_topic_meta_caps'          ), 10, 4 );
-        add_filter( 'bbp_map_reply_meta_caps',   array( $this, 'map_topic_meta_caps'          ), 10, 4 );
+        add_filter( 'bbp_map_meta_caps',         array( $this, 'map_group_forum_meta_caps'    ), 99, 4 );
 
         // Map group forum activity items to groups
@@ -178 +177 @@
      * @return array
      */
-    public function map_topic_meta_caps( $caps = array(), $cap = '', $user_id = 0, $args = array() ) {
-
-        // Bail if not viewing a single topic
-        if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'forum' ) || ! bp_is_action_variable( 0, 'topic' ) )
+    public function map_group_forum_meta_caps( $caps = array(), $cap = '', $user_id = 0, $args = array() ) {
+
+        // Bail if not viewing a group forum
+        if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'forum' ) )
             return $caps;