Ticket #7951: 7951.02.patch

src/bp-activity/bp-activity-functions.php

@@ -3916 +3916 @@
         return (bool) apply_filters( 'bp_activity_do_heartbeat', $retval );
 }
 
-/**
- * AJAX endpoint for Suggestions API lookups.
- *
- * @since 2.1.0
- */
-function bp_ajax_get_suggestions() {
-        if ( ! bp_is_user_active() || empty( $_GET['term'] ) || empty( $_GET['type'] ) ) {
-                wp_send_json_error( 'missing_parameter' );
-                exit;
-        }
-
-        $args = array(
-                'term' => sanitize_text_field( $_GET['term'] ),
-                'type' => sanitize_text_field( $_GET['type'] ),
-        );
-
-        // Support per-Group suggestions.
-        if ( ! empty( $_GET['group-id'] ) ) {
-                $args['group_id'] = absint( $_GET['group-id'] );
-        }
-
-        $results = bp_core_get_suggestions( $args );
-
-        if ( is_wp_error( $results ) ) {
-                wp_send_json_error( $results->get_error_message() );
-                exit;
-        }
-
-        wp_send_json_success( $results );
-}
-add_action( 'wp_ajax_bp_get_suggestions', 'bp_ajax_get_suggestions' );
-
 /**
  * Detect a change in post type status, and initiate an activity update if necessary.
  *

src/bp-core/bp-core-functions.php

@@ -2767 +2767 @@
         return apply_filters( 'bp_core_get_suggestions', $retval, $args );
 }
 
+/**
+ * AJAX endpoint for Suggestions API lookups.
+ *
+ * @since  2.1.0
+ * @since  3.3.0 Moved here to make sure this function is available
+ *               even if the Activity component is not active.
+ */
+function bp_ajax_get_suggestions() {
+        if ( ! bp_is_user_active() || empty( $_GET['term'] ) || empty( $_GET['type'] ) ) {
+                wp_send_json_error( 'missing_parameter' );
+                exit;
+        }
+
+        $args = array(
+                'term' => sanitize_text_field( $_GET['term'] ),
+                'type' => sanitize_text_field( $_GET['type'] ),
+        );
+
+        // Support per-Group suggestions.
+        if ( ! empty( $_GET['group-id'] ) ) {
+                $args['group_id'] = absint( $_GET['group-id'] );
+        }
+
+        $results = bp_core_get_suggestions( $args );
+
+        if ( is_wp_error( $results ) ) {
+                wp_send_json_error( $results->get_error_message() );
+                exit;
+        }
+
+        wp_send_json_success( $results );
+}
+add_action( 'wp_ajax_bp_get_suggestions', 'bp_ajax_get_suggestions' );
+
 /**
  * Set data from the BP root blog's upload directory.
  *