Changeset 4372 for trunk/bp-core/bp-core-classes.php

Timestamp:

05/16/2011 08:54:02 PM (15 years ago)

Author:

boonebgorges

Message:

Abstracts user_meta keys so that they can be filtered. Fixes #2952

File:

• trunk/bp-core/bp-core-classes.php (modified) (5 diffs)

trunk/bp-core/bp-core-classes.php

@@ -60 +60 @@
      */
     function populate() {
+        global $bp;
+        
         if ( bp_is_active( 'xprofile' ) )
             $this->profile_data = $this->get_profile_data();
@@ -83 +85 @@
         $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) );
         $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
-        $this->last_active  = bp_core_get_last_activity( get_user_meta( $this->id, 'last_activity', true ), __( 'active %s ago', 'buddypress' ) );
+        $this->last_active  = bp_core_get_last_activity( get_user_meta( $this->id, bp_get_user_meta_key( 'last_activity' ), true ), __( 'active %s ago', 'buddypress' ) );
     }
 
@@ -144 +146 @@
 
         if ( 'active' == $type || 'online' == $type || 'newest' == $type )
-            $sql['where_active'] = "AND um.meta_key = 'last_activity'";
+            $sql['where_active'] = $wpdb->prepare( "AND um.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
 
         if ( 'popular' == $type )
@@ -409 +411 @@
 
         if ( 'active' != $type ) {
-            $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} )" );
+            $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
                 foreach ( (array)$user_activity as $activity ) {
@@ -420 +422 @@
         // Fetch the user's last_activity
         if ( 'active' != $type ) {
-            $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} )" );
+            $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} )" );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
                 foreach ( (array)$user_activity as $activity ) {