Ticket #5934: 5934.02.patch

src/bp-activity/bp-activity-actions.php

@@ -753 +753 @@
                 exit;
         }
 
-        $results = bp_core_get_suggestions( array(
+        $args = bp_parse_args( array(
                 'term' => sanitize_text_field( $_GET['term'] ),
                 'type' => sanitize_text_field( $_GET['type'] ),
-        ) );
+        ), array(
+                'term' => '',
+                'type' => 'alphabetical',
+        ), 'ajax_get_suggestions' );
+
+        $results = bp_core_get_suggestions( $args );
 
         if ( is_wp_error( $results ) ) {
                 wp_send_json_error( $results->get_error_message() );

src/bp-groups/bp-groups-filters.php

@@ -233 +233 @@
         return apply_filters( 'groups_filter_bbpress_root_page_sql', 't.topic_id' );
 }
 add_filter( 'get_latest_topics_fields', 'groups_filter_forums_root_page_sql' );
+
+
+
+/** BuddyPress Mentions for single groups *************************************/
+
+/**
+ * Make sure Mentions JS are loaded when on a Groups single item
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param  bool whether to load or not JS
+ * @uses   bp_is_group_activity() to check if the current page is a group's activity page
+ * @uses   bp_is_group_home() to check if the current page is a single group's home page?
+ * @uses   bp_is_group_forum_topic_edit() to check if the current page is a group forum topic edit page
+ * @return bool        true if on a Groups single item
+ */
+function bp_groups_load_mentions_scripts( $load = false ) {
+        if ( empty( $load ) ) {
+                $load = bp_is_group_activity() || bp_is_group_home() || bp_is_group_forum_topic_edit();
+                remove_action( 'bp_activity_mentions_prime_results', 'bp_friends_prime_mentions_results' );
+        }
+
+        return $load;
+}
+add_filter( 'bp_activity_maybe_load_mentions_scripts', 'bp_groups_load_mentions_scripts', 10, 1 );
+
+/**
+ * Make sure only the group members will be fetched when on a Groups single item
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param  array $args the suggestions arguments
+ * @uses   bp_is_group_activity() to check if the current page is a group's activity page
+ * @uses   bp_is_group_home() to check if the current page is a single group's home page?
+ * @uses   bp_is_group_forum_topic_edit() to check if the current page is a group forum topic edit page
+ * @uses   bp_get_current_group_id() to get the current group id
+ * @return array       the suggestions arguments including group_id if needed
+ */
+function bp_groups_get_group_member_suggestions_args( $args = array() ) {
+        if ( ! bp_is_group_activity() && ! bp_is_group_home() && ! bp_is_group_forum_topic_edit() ) {
+                return $args;
+        }
+
+        $args['group_id'] = bp_get_current_group_id();
+
+        return $args;
+}
+add_filter( 'bp_before_ajax_get_suggestions_parse_args', 'bp_groups_get_group_member_suggestions_args', 10, 1 );