Changeset 12286

Timestamp:

11/15/2018 07:17:12 PM (6 years ago)

Author:

boonebgorges

Message:

Move bp_ajax_get_suggestions() handler to Core component.

It was previously located in the Activity component, which made it
impossible to do an AJAX suggestions query (such as in the case of
Messages) when Activity was disabled.

Props imath.

See #7951.

Location:

trunk/src

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)

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

@@ -3918 +3918 @@
 
 /**
- * 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.
  *

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

@@ -2771 +2771 @@
 
 /**
+ * AJAX endpoint for Suggestions API lookups.
+ *
+ * @since 2.1.0
+ * @since 4.0.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.
  *