Skip to:
Content

BuddyPress.org

Changeset 4372


Ignore:
Timestamp:
05/16/2011 08:54:02 PM (14 years ago)
Author:
boonebgorges
Message:

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

Location:
trunk
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-classes.php

    r4211 r4372  
    524524
    525525    function total_favorite_count( $user_id ) {
    526         global $bp;
    527 
    528         if ( !$favorite_activity_entries = get_user_meta( $user_id, 'bp_favorite_activities', true ) )
     526        if ( !$favorite_activity_entries = get_user_meta( $user_id, bp_get_user_meta_key( 'favorite_activities' ), true ) )
    529527            return 0;
    530528

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

    r4369 r4372  
    3939 */
    4040function bp_activity_clear_new_mentions( $user_id ) {
    41     delete_user_meta( $user_id, 'bp_new_mention_count' );
    42     delete_user_meta( $user_id, 'bp_new_mentions' );
     41    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ) );
     42    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ) );
    4343}
    4444
    … …  
    6565
    6666            // Adjust the mention list and count for the member
    67             $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
    68             if ( !$new_mentions = get_user_meta( $user_id, 'bp_new_mentions', true ) )
     67            $new_mention_count = (int)get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), true );
     68            if ( !$new_mentions = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), true ) )
    6969                $new_mentions = array();
    7070               
    … …  
    8989           
    9090            // Resave the user_meta
    91             update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count );
    92             update_user_meta( $user_id, 'bp_new_mentions', $new_mentions );
     91            update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), $new_mention_count );
     92            update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), $new_mentions );
    9393        }
    9494    }
    … …  
    191191
    192192    // Get favorites for user
    193     $favs = get_user_meta( $user_id, 'bp_favorite_activities', true );
     193    $favs = get_user_meta( $user_id, bp_get_user_meta_key( 'favorite_activities' ), true );
    194194
    195195    return apply_filters( 'bp_activity_get_user_favorites', $favs );
    … …  
    216216
    217217    // Update the user's personal favorites
    218     $my_favs   = get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true );
     218    $my_favs   = get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'favorite_activities' ), true );
    219219    $my_favs[] = $activity_id;
    220220
    … …  
    224224
    225225    // Update user meta
    226     update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
     226    update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'favorite_activities' ), $my_favs );
    227227
    228228    // Update activity meta counts
    … …  
    256256
    257257    // Remove the fav from the user's favs
    258     $my_favs = get_user_meta( $user_id, 'bp_favorite_activities', true );
     258    $my_favs = get_user_meta( $user_id, bp_get_user_meta_key( 'favorite_activities' ), true );
    259259    $my_favs = array_flip( (array) $my_favs );
    260260    unset( $my_favs[$activity_id] );
    … …  
    268268
    269269            // Update users favorites
    270             if ( update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ) ) {
     270            if ( update_user_meta( $user_id, bp_get_user_meta_key( 'favorite_activities' ), $my_favs ) ) {
    271271
    272272                // Execute additional code
    … …  
    500500
    501501    // Remove any usermeta
    502     delete_user_meta( $user_id, 'bp_latest_update' );
    503     delete_user_meta( $user_id, 'bp_favorite_activities' );
     502    delete_user_meta( $user_id, bp_get_user_meta_key( 'latest_update' ) );
     503    delete_user_meta( $user_id, bp_get_user_meta_key( 'favorite_activities' ) );
    504504
    505505    // Execute additional code
    … …  
    676676
    677677    // Add this update to the "latest update" usermeta so it can be fetched anywhere.
    678     update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
     678    update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'latest_update' ), array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
    679679
    680680    // Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action.
    … …  
    808808    do_action( 'bp_before_activity_delete', $args );
    809809
    810     $latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
     810    $latest_update = get_user_meta( $user_id, bp_get_user_meta_key( 'latest_update' ), true );
    811811    if ( !empty( $latest_update ) ) {
    812812        if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
    813             delete_user_meta( $user_id, 'bp_latest_update' );
     813            delete_user_meta( $user_id, bp_get_user_meta_key( 'latest_update' ) );
    814814    }
    815815

  • trunk/bp-activity/bp-activity-loader.php

    r4281 r4372  
    6363            define( 'BP_ACTIVITY_SLUG', $this->id );
    6464
    65         // Global tables for messaging component
     65        // Global tables for activity component
    6666        $global_tables = array(
    6767            'table_name'      => $bp->table_prefix . 'bp_activity',
    6868            'table_name_meta' => $bp->table_prefix . 'bp_activity_meta',
    6969        );
    70 
    71         // All globals for messaging component.
     70       
     71        // User meta keys
     72        $user_meta_keys = array(
     73            'new_mention_count'             => 'bp_new_mention_count',
     74            'new_mentions'              => 'bp_new_mentions',
     75            'favorite_activities'           => 'bp_favorite_activities',
     76            'latest_update'             => 'bp_latest_update',
     77            'notification_activity_new_mention' => 'notification_activity_new_mention',
     78            'notification_activity_new_reply'   => 'notification_activity_new_reply'
     79        );
     80
     81        // All globals for activity component.
    7282        // Note that global_tables is included in this array.
    7383        $globals = array(
    … …  
    7787            'search_string'         => __( 'Search Activity...', 'buddypress' ),
    7888            'global_tables'         => $global_tables,
     89            'user_meta_keys'    => $user_meta_keys
    7990        );
    8091

  • trunk/bp-activity/bp-activity-notifications.php

    r4277 r4372  
    3535
    3636        // Now email the user with the contents of the message (if they have enabled email notifications)
    37         if ( 'no' != get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
     37        if ( 'no' != get_user_meta( $receiver_user_id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) ) {
    3838            $poster_name = bp_core_get_user_displayname( $poster_user_id );
    3939
    … …  
    8282    $original_activity = new BP_Activity_Activity( $activity_id );
    8383
    84     if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
     84    if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) ) {
    8585        $poster_name = bp_core_get_user_displayname( $commenter_id );
    8686        $thread_link = bp_activity_get_permalink( $activity_id );
    … …  
    127127    $parent_comment = new BP_Activity_Activity( $parent_id );
    128128
    129     if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
     129    if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) ) {
    130130        $poster_name = bp_core_get_user_displayname( $commenter_id );
    131131        $thread_link = bp_activity_get_permalink( $activity_id );

  • trunk/bp-activity/bp-activity-screens.php

    r4367 r4372  
    149149    global $bp;
    150150
    151     if ( !$mention = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) )
     151    if ( !$mention = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) )
    152152        $mention = 'yes';
    153153
    154     if ( !$reply = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) )
     154    if ( !$reply = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) )
    155155        $reply = 'yes'; ?>
    156156

  • trunk/bp-activity/bp-activity-template.php

    r4340 r4372  
    9494
    9595        // Get an array of the logged in user's favorite activities
    96         $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
     96        $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'favorite_activities' ), true ) );
    9797
    9898        // Fetch specific activity items based on ID's
    … …  
    10261026            $user_id = $bp->displayed_user->id;
    10271027
    1028         if ( !$update = get_user_meta( $user_id, 'bp_latest_update', true ) )
     1028        if ( !$update = get_user_meta( $user_id, bp_get_user_meta_key( 'latest_update' ), true ) )
    10291029            return false;
    10301030
    … …  
    11421142}
    11431143    function bp_get_total_mention_count_for_user( $user_id = 0 ) {
    1144         return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, 'bp_new_mention_count', true ) );
     1144        global $bp;
     1145       
     1146        return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, bp_get_user_meta_key( 'new_mention_count' ), true ) );
    11451147    }
    11461148

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

    r4360 r4372  
    6060     */
    6161    function populate() {
     62        global $bp;
     63       
    6264        if ( bp_is_active( 'xprofile' ) )
    6365            $this->profile_data = $this->get_profile_data();
    … …  
    8385        $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) );
    8486        $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
    85         $this->last_active  = bp_core_get_last_activity( get_user_meta( $this->id, 'last_activity', true ), __( 'active %s ago', 'buddypress' ) );
     87        $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' ) );
    8688    }
    8789
    … …  
    144146
    145147        if ( 'active' == $type || 'online' == $type || 'newest' == $type )
    146             $sql['where_active'] = "AND um.meta_key = 'last_activity'";
     148            $sql['where_active'] = $wpdb->prepare( "AND um.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
    147149
    148150        if ( 'popular' == $type )
    … …  
    409411
    410412        if ( 'active' != $type ) {
    411             $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} )" );
     413            $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} )" );
    412414            for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    413415                foreach ( (array)$user_activity as $activity ) {
    … …  
    420422        // Fetch the user's last_activity
    421423        if ( 'active' != $type ) {
    422             $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} )" );
     424            $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} )" );
    423425            for ( $i = 0; $i < count( $paged_users ); $i++ ) {
    424426                foreach ( (array)$user_activity as $activity ) {

  • trunk/bp-core/bp-core-component.php

    r4281 r4372  
    9595     * @uses apply_filters() Calls 'bp_{@link bp_Component::name}_id'
    9696     * @uses apply_filters() Calls 'bp_{@link bp_Component::name}_slug'
     97     * @uses apply_filters() Calls 'bp_user_meta_keys_$key_name'
    9798     *
    9899     * @param arr $args Used to
    … …  
    109110            'search_string'         => '',
    110111            'global_tables'         => '',
     112            'user_meta_keys'    => array()
    111113        );
    112114        $r = wp_parse_args( $args, $defaults );
    … …  
    128130            foreach ( $r['global_tables'] as $global_name => $table_name )
    129131                $this->$global_name = $table_name;
    130 
     132           
     133        // User meta keys
     134        if ( !empty( $r['user_meta_keys'] ) ) {
     135            foreach ( $r['user_meta_keys'] as $key_name => $key_value )
     136                $bp->user_meta_keys->$key_name = apply_filters( "bp_user_meta_keys_$key_name", $key_value );
     137        }
     138       
    131139        /** BuddyPress ********************************************************/
    132140

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

    r4344 r4372  
    642642        return false;
    643643
    644     $activity = get_user_meta( $bp->loggedin_user->id, 'last_activity', true );
     644    $activity = get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), true );
    645645
    646646    if ( !is_numeric( $activity ) )
    … …  
    651651
    652652    if ( empty( $activity ) || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) )
    653         update_user_meta( $bp->loggedin_user->id, 'last_activity', $current_time );
     653        update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), $current_time );
    654654}
    655655add_action( 'wp_head', 'bp_core_record_activity' );
    … …  
    996996}
    997997
     998/**
     999 * Get the meta_key for a given piece of user metadata
     1000 *
     1001 * BuddyPress stores a number of pieces of userdata in the WordPress central usermeta table. In
     1002 * order to allow plugins to enable multiple instances of BuddyPress on a single WP installation,
     1003 * BP's usermeta keys are abstracted and stored in the $bp global, at $bp->user_meta_keys.
     1004 *
     1005 * Plugin authors who access or modify metadata created by BuddyPress should use
     1006 * this function exclusively in the context of the _user_meta() functions. For example,
     1007 *    $last_active = get_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ), true );
     1008 * Do not hardcode these keys.
     1009 *
     1010 * If your plugin introduces custom user metadata that might change between multiple BP instances
     1011 * on a single WP installation, you are strongly recommended to register your meta keys in the $bp
     1012 * global (see BP_Core_Component::setup_globals()), and use this function when storing and
     1013 * retrieving metadata.
     1014 *
     1015 * @package BuddyPress
     1016 * @since 1.3
     1017 * @see BP_Core_Component::_setup_globals()
     1018 *
     1019 * @uses apply_filters() Filter bp_get_user_meta_key to modify keys individually
     1020 * @param str $name
     1021 * @return str $key
     1022 */
     1023function bp_get_user_meta_key( $name = false ) {
     1024    global $bp;
     1025   
     1026    if ( !$name )
     1027        return false;
     1028   
     1029    $key = isset( $bp->user_meta_keys->$name ) ? $bp->user_meta_keys->$name : false;
     1030   
     1031    return apply_filters( 'bp_get_user_meta_key', $key, $name );
     1032}
     1033
    9981034/** Global Manipulators *******************************************************/
    9991035

  • trunk/bp-core/bp-core-loader.php

    r4211 r4372  
    150150        // The user ID of the user who is currently logged in.
    151151        $bp->loggedin_user->id   = $current_user->ID;
     152       
     153        // Keys for BP user_meta
     154        $bp->user_meta_keys->last_activity  = apply_filters( 'bp_user_meta_key_last_activity', 'last_activity' );
     155        $bp->user_meta_keys->closed_notices     = apply_filters( 'bp_user_meta_key_closed_notices', 'closed_notices' );
    152156
    153157        /** Avatars ***********************************************************/

  • trunk/bp-friends/bp-friends-classes.php

    r4211 r4372  
    133133
    134134        // Do not update meta if user has never had friends
    135         if ( !$count && !get_user_meta( $user_id, 'total_friend_count', true ) )
     135        if ( !$count && !get_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), true ) )
    136136            return 0;
    137137
    138         update_user_meta( $user_id, 'total_friend_count', (int)$count );
     138        update_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), (int)$count );
    139139        return (int)$count;
    140140    }
    … …  
    202202        global $wpdb, $bp;
    203203
    204         return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC" ) );
     204        return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = '" . bp_get_user_meta_key( 'last_activity' ) . "' AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC" ) );
    205205    }
    206206

  • trunk/bp-friends/bp-friends-functions.php

    r4336 r4372  
    156156
    157157    if ( !$count = wp_cache_get( 'bp_total_friend_count_' . $user_id, 'bp' ) ) {
    158         $count = get_user_meta( $user_id, 'total_friend_count', true );
     158        $count = get_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), true );
    159159        if ( empty( $count ) ) $count = 0;
    160160        wp_cache_set( 'bp_total_friend_count_' . $user_id, $count, 'bp' );
    … …  
    257257
    258258function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
     259    global $bp;
     260   
     261    $meta_key = bp_get_user_meta_key( 'total_friend_count' );
     262   
    259263    if ( 'add' == $status ) {
    260         update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 );
    261         update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) + 1 );
     264        update_user_meta( $initiator_user_id, $meta_key, (int)get_user_meta( $initiator_user_id, $meta_key, true ) + 1 );
     265        update_user_meta( $friend_user_id, $meta_key, (int)get_user_meta( $friend_user_id, $meta_key, true ) + 1 );
    262266    } else {
    263         update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) - 1 );
    264         update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) - 1 );
     267        update_user_meta( $initiator_user_id, $meta_key, (int)get_user_meta( $initiator_user_id, $meta_key, true ) - 1 );
     268        update_user_meta( $friend_user_id, $meta_key, (int)get_user_meta( $friend_user_id, $meta_key, true ) - 1 );
    265269    }
    266270}
    … …  
    274278
    275279    // Remove usermeta
    276     delete_user_meta( $user_id, 'total_friend_count' );
     280    delete_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ) );
    277281
    278282    // Remove friendship requests FROM user

  • trunk/bp-friends/bp-friends-loader.php

    r4321 r4372  
    7171            'table_name_meta' => $bp->table_prefix . 'bp_friends_meta',
    7272        );
     73       
     74        // User meta keys
     75        $user_meta_keys = array(
     76            'total_friend_count'                => 'total_friend_count',
     77            'notification_friends_friendship_request'   => 'notification_friends_friendship_request',
     78            'notification_friends_friendship_accepted'  => 'notification_friends_friendship_accepted'
     79        );
    7380
    7481        // All globals for the friends component.
    … …  
    8087            'notification_callback' => 'friends_format_notifications',
    8188            'global_tables'         => $global_tables,
     89            'user_meta_keys'    => $user_meta_keys
    8290        );
    8391

  • trunk/bp-friends/bp-friends-notifications.php

    r4247 r4372  
    66    $initiator_name = bp_core_get_user_displayname( $initiator_id );
    77
    8     if ( 'no' == get_user_meta( (int)$friend_id, 'notification_friends_friendship_request', true ) )
     8    if ( 'no' == get_user_meta( (int)$friend_id, bp_get_user_meta_key( 'notification_friends_friendship_request' ), true ) )
    99        return false;
    1010
    … …  
    5151    $friend_name = bp_core_get_user_displayname( $friend_id );
    5252
    53     if ( 'no' == get_user_meta( (int)$initiator_id, 'notification_friends_friendship_accepted', true ) )
     53    if ( 'no' == get_user_meta( (int)$initiator_id, bp_get_user_meta_key( 'notification_friends_friendship_accepted' ), true ) )
    5454        return false;
    5555

  • trunk/bp-friends/bp-friends-screens.php

    r4287 r4372  
    5555    global $bp;
    5656
    57 
    58     if ( !$send_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) )
     57    if ( !$send_requests = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_friends_friendship_request' ), true ) )
    5958        $send_requests   = 'yes';
    6059
    61     if ( !$accept_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) )
     60    if ( !$accept_requests = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_friends_friendship_accepted' ), true ) )
    6261        $accept_requests = 'yes';
    6362?>

  • trunk/bp-groups/bp-groups-classes.php

    r4324 r4372  
    715715
    716716    function ban() {
     717        global $bp;
     718       
    717719        if ( $this->is_admin )
    718720            return false;
    … …  
    723725        groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
    724726
    725         $group_count = get_user_meta( $this->user_id, 'total_group_count', true );
     727        $group_count = get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true );
    726728        if ( !empty( $group_count ) )
    727             update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
     729            update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)$group_count - 1 );
    728730
    729731        return $this->save();
    … …  
    731733
    732734    function unban() {
     735        global $bp;
     736       
    733737        if ( $this->is_admin )
    734738            return false;
    … …  
    737741
    738742        groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
    739         update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
     743        update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 );
    740744
    741745        return $this->save();
    … …  
    743747
    744748    function accept_invite() {
     749        global $bp;
     750       
    745751        $this->inviter_id    = 0;
    746752        $this->is_confirmed  = 1;
    747753        $this->date_modified = bp_core_current_time();
    748754
    749         update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
     755        update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 );
    750756    }
    751757
    752758    function accept_request() {
     759        global $bp;
     760       
    753761        $this->is_confirmed = 1;
    754762        $this->date_modified = bp_core_current_time();
    755763
    756         update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
     764        update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 );
    757765    }
    758766
    … …  
    767775        groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
    768776
    769         $group_count = get_user_meta( $this->user_id, 'total_group_count', true );
     777        $group_count = get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true );
    770778        if ( !empty( $group_count ) )
    771             update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
     779            update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)$group_count - 1 );
    772780
    773781        return $result;

  • trunk/bp-groups/bp-groups-functions.php

    r4324 r4372  
    249249
    250250    // Modify user's group memberhip count
    251     update_user_meta( $user_id, 'total_group_count', (int) get_user_meta( $user_id, 'total_group_count', true ) - 1 );
     251    update_user_meta( $user_id, $bp->user_meta_keys->total_group_count, (int) get_user_meta( $user_id, bp_get_user_meta_key( 'total_group_count' ), true ) - 1 );
    252252
    253253    /**

  • trunk/bp-groups/bp-groups-loader.php

    r4321 r4372  
    7474            'table_name_groupmeta' => $bp->table_prefix . 'bp_groups_groupmeta'
    7575        );
     76       
     77        // User meta_keys
     78        $user_meta_keys = array(
     79            'total_group_count'                     => 'total_group_count',
     80            'notification_groups_group_updated'         => 'notification_groups_group_updated',
     81            'notification_groups_membership_request'    => 'notification_groups_membership_request',
     82            'notification_membership_request_completed' => 'notification_membership_request_completed',
     83            'notification_groups_invite'            => 'notification_groups_invite',
     84            'notification_groups_admin_promotion'       => 'notification_groups_admin_promotion'
     85        );
    7686
    7787        // All globals for messaging component.
    … …  
    8393            'search_string'         => __( 'Search Groups...', 'buddypress' ),
    8494            'global_tables'         => $global_tables,
     95            'user_meta_keys'    => $user_meta_keys
    8596        );
    8697

  • trunk/bp-groups/bp-groups-notifications.php

    r4324 r4372  
    1010    $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
    1111    foreach ( (array)$user_ids as $user_id ) {
    12         if ( 'no' == get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue;
     12        if ( 'no' == get_user_meta( $user_id, bp_get_user_meta_key( 'notification_groups_group_updated' ), true ) ) continue;
    1313
    1414        $ud = bp_core_get_core_userdata( $user_id );
    … …  
    4848    bp_members_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
    4949
    50     if ( 'no' == get_user_meta( $admin_id, 'notification_groups_membership_request', true ) )
     50    if ( 'no' == get_user_meta( $admin_id, bp_get_user_meta_key( 'notification_groups_membership_request' ), true ) )
    5151        return false;
    5252
    … …  
    100100        bp_members_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
    101101
    102     if ( 'no' == get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) )
     102    if ( 'no' == get_user_meta( $requesting_user_id, bp_get_user_meta_key( 'notification_membership_request_completed' ), true ) )
    103103        return false;
    104104
    … …  
    161161    bp_members_add_notification( $group_id, $user_id, 'groups', $type );
    162162
    163     if ( 'no' == get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
     163    if ( 'no' == get_user_meta( $user_id, bp_get_user_meta_key( 'notification_groups_admin_promotion' ), true ) )
    164164        return false;
    165165
    … …  
    211211        bp_members_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
    212212
    213         if ( 'no' == get_user_meta( $invited_user_id, 'notification_groups_invite', true ) )
     213        if ( 'no' == get_user_meta( $invited_user_id, bp_get_user_meta_key( 'notification_groups_invite' ), true ) )
    214214            return false;
    215215
    … …  
    272272
    273273        // Now email the user with the contents of the message (if they have enabled email notifications)
    274         if ( 'no' != get_user_meta( $user_id, 'notification_activity_new_mention', true ) ) {
     274        if ( 'no' != get_user_meta( $user_id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) ) {
    275275            $poster_name = bp_core_get_user_displayname( $poster_user_id );
    276276

  • trunk/bp-groups/bp-groups-screens.php

    r4324 r4372  
    787787    global $bp;
    788788
    789     if ( !$group_invite = get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) )
     789    if ( !$group_invite = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_invite' ), true ) )
    790790        $group_invite  = 'yes';
    791791
    792     if ( !$group_update = get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) )
     792    if ( !$group_update = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_group_updated' ), true ) )
    793793        $group_update  = 'yes';
    794794
    795     if ( !$group_promo = get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) )
     795    if ( !$group_promo = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_admin_promotion' ), true ) )
    796796        $group_promo   = 'yes';
    797797
    798     if ( !$group_request = get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) )
     798    if ( !$group_request = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_membership_request' ), true ) )
    799799        $group_request = 'yes';
    800800?>

  • trunk/bp-members/bp-members-functions.php

    r4371 r4372  
    8282 * @global $current_user WordPress global variable containing current logged in user information
    8383 * @param user_id The ID of the user.
    84  * @uses get_user_meta() WordPress function to get the usermeta for a user.
    8584 */
    8685function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) {
    … …  
    628627function bp_core_remove_data( $user_id ) {
    629628    // Remove usermeta
    630     delete_user_meta( $user_id, 'last_activity' );
     629    delete_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ) );
    631630
    632631    // Flush the cache to remove the user from all cached objects

  • trunk/bp-members/bp-members-template.php

    r4360 r4372  
    751751            $user_id = $bp->displayed_user->id;
    752752
    753         $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') );
     753        $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ), true ), __('active %s ago', 'buddypress') );
    754754
    755755        return apply_filters( 'bp_get_last_activity', $last_activity );

  • trunk/bp-messages/bp-messages-classes.php

    r4350 r4372  
    420420        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) );
    421421
    422         update_user_meta( $bp->loggedin_user->id, 'last_activity', bp_core_current_time() );
     422        update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), bp_core_current_time() );
    423423
    424424        do_action_ref_array( 'messages_notice_after_save', array( &$this ) );

  • trunk/bp-messages/bp-messages-loader.php

    r4281 r4372  
    7070            'table_name_recipients' => $bp->table_prefix . 'bp_messages_recipients'
    7171        );
     72       
     73        $user_meta_keys = array(
     74            'notification_messages_new_message' => 'notification_messages_new_message',
     75            'notification_messages_new_notice'  => 'notification_messages_new_notice'
     76        );
    7277
    7378        // All globals for messaging component.
    … …  
    7883            'search_string'         => __( 'Search Messages...', 'buddypress' ),
    7984            'global_tables'         => $global_tables,
     85            'user_meta_keys'    => $user_meta_keys
    8086        );
    8187

  • trunk/bp-messages/bp-messages-notifications.php

    r4144 r4372  
    1010
    1111    foreach( $recipients as $recipient ) {
    12         if ( $sender_id == $recipient->user_id || 'no' == get_user_meta( $recipient->user_id, 'notification_messages_new_message', true ) )
     12        if ( $sender_id == $recipient->user_id || 'no' == get_user_meta( $recipient->user_id, bp_get_user_meta_key( 'notification_messages_new_message' ), true ) )
    1313            continue;
    1414

  • trunk/bp-messages/bp-messages-screens.php

    r4287 r4372  
    105105    global $bp;
    106106
    107     if ( !$new_messages = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) )
     107    if ( !$new_messages = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_messages_new_message' ), true ) )
    108108        $new_messages = 'yes';
    109109
    110     if ( !$new_notices = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) )
     110    if ( !$new_notices = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_messages_new_notice' ), true ) )
    111111        $new_notices  = 'yes';
    112112?>

  • trunk/bp-messages/bp-messages-template.php

    r4252 r4372  
    504504        return false;
    505505
    506     $closed_notices = get_user_meta( $userdata->ID, 'closed_notices', true );
     506    $closed_notices = get_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), true );
    507507
    508508    if ( !$closed_notices )

  • trunk/bp-settings/bp-settings-actions.php

    r4261 r4372  
    117117        if ( isset( $_POST['notifications'] ) ) {
    118118            foreach ( (array)$_POST['notifications'] as $key => $value ) {
    119                 update_user_meta( (int)$bp->displayed_user->id, $key, $value );
     119                if ( $meta_key = bp_get_user_meta_key( $key ) )
     120                    update_user_meta( (int)$bp->displayed_user->id, $meta_key, $value );
    120121            }
    121122        }

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

    r4367 r4372  
    257257        return false;
    258258    }
    259 
     259   
    260260    do_action( 'bp_activity_action_delete_activity', $activity->id, $activity->user_id );
    261261
    … …  
    499499        echo "-1<div id='message' class='error'><p>" . __('There was a problem closing the notice.', 'buddypress') . '</p></div>';
    500500    } else {
    501         $notice_ids = get_user_meta( $userdata->ID, 'closed_notices', true );
     501        $notice_ids = get_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), true );
    502502
    503503        $notice_ids[] = (int) $_POST['notice_id'];
    504504
    505         update_user_meta( $userdata->ID, 'closed_notices', $notice_ids );
     505        update_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), $notice_ids );
    506506    }
    507507}

  • trunk/bp-xprofile/bp-xprofile-loader.php

    r4321 r4372  
    9393        );
    9494
     95        $user_meta_keys = array(
     96            'profile_last_updated' => 'profile_last_updated'
     97        );
     98
    9599        $globals = array(
    96100            'slug'                  => BP_XPROFILE_SLUG,
    97101            'root_slug'             => isset( $bp->pages->xprofile->slug ) ? $bp->pages->xprofile->slug : BP_XPROFILE_SLUG,
    98102            'notification_callback' => 'xprofile_format_notifications',
    99             'global_tables'         => $global_tables
     103            'global_tables'         => $global_tables,
     104            'user_meta_keys'    => $user_meta_keys
    100105        );
    101106

  • trunk/bp-xprofile/bp-xprofile-template.php

    r4362 r4372  
    713713        global $bp;
    714714
    715         $last_updated = get_user_meta( $bp->displayed_user->id, 'profile_last_updated', true );
     715        $last_updated = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'profile_last_updated' ), true );
    716716
    717717        if ( $last_updated )
Note: See TracChangeset for help on using the changeset viewer.