Changeset 2422 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

01/24/2010 02:29:57 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1661

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (4 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -10 +10 @@
  */
 
-function bp_dtheme_content_filter() {
-        global $bp;
-
-        $content = esc_attr( $_POST['content'] );
-        $type = esc_attr( $_POST['type'] );
+function bp_dtheme_object_filter() {
+        global $bp;
+
+        $object = esc_attr( $_POST['object'] );
         $filter = esc_attr( $_POST['filter'] );
         $page = esc_attr( $_POST['page'] );
         $search_terms = esc_attr( $_POST['search_terms'] );
 
+        /**
+         * Scope is the scope of results to use, either all (everything) or personal (just mine).
+         * For example if the object is groups, it would be all groups, or just groups I belong to.
+         */
+        $scope = esc_attr( $_POST['scope'] );
+
         /* Plugins can pass extra parameters and use the bp_dtheme_ajax_querystring_content_filter filter to parse them */
         $extras = esc_attr( $_POST['extras'] );
@@ -29 +34 @@
                 $filter = 'active';
 
-        if ( empty( $type ) )
-                $type = 'all';
-
         $bp->ajax_querystring = 'type=' . $filter . '&page=' . $page;
 
@@ -37 +39 @@
                 $bp->ajax_querystring .= '&search_terms=' . $search_terms;
 
-        if ( $type != 'all' || $bp->displayed_user->id ) {
+        if ( $scope != 'all' || $bp->displayed_user->id ) {
                 $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
                 $bp->ajax_querystring .= '&user_id=' . $user_id;
@@ -44 +46 @@
         $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_content_filter', $bp->ajax_querystring, $extras );
 
-        locate_template( array( "$content/$content-loop.php" ), true );
-}
-add_action( 'wp_ajax_members_filter', 'bp_dtheme_content_filter' );
-add_action( 'wp_ajax_groups_filter', 'bp_dtheme_content_filter' );
-add_action( 'wp_ajax_blogs_filter', 'bp_dtheme_content_filter' );
-add_action( 'wp_ajax_forums_filter', 'bp_dtheme_content_filter' );
+        locate_template( array( "$object/$object-loop.php" ), true );
+}
+add_action( 'wp_ajax_members_filter', 'bp_dtheme_object_filter' );
+add_action( 'wp_ajax_groups_filter', 'bp_dtheme_object_filter' );
+add_action( 'wp_ajax_blogs_filter', 'bp_dtheme_object_filter' );
+add_action( 'wp_ajax_forums_filter', 'bp_dtheme_object_filter' );
 
 function bp_dtheme_post_update() {