Skip to:
Content

BuddyPress.org

Changeset 1723


Ignore:
Timestamp:
08/28/2009 07:05:23 PM (15 years ago)
Author:
apeatling
Message:

Fixing bug with inconsistent name display.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-blogs.php

    r1718 r1723  
    122122}
    123123add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );   
    124 add_action( 'admin_menu', 'bp_blogs_setup_globals', 1 );
     124add_action( 'admin_menu', 'bp_blogs_setup_globals', 2 );
    125125
    126126function bp_blogs_setup_root_component() {
     
    128128    bp_core_add_root_component( BP_BLOGS_SLUG );
    129129}
    130 add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 1 );
     130add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 2 );
    131131
    132132/**
     
    173173function bp_blogs_directory_blogs_setup() {
    174174    global $bp;
    175    
     175
    176176    if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
    177177        $bp->is_directory = true;
  • trunk/bp-core.php

    r1721 r1723  
    163163        $bp->current_component = $bp->default_component;
    164164}
    165 add_action( 'plugins_loaded', 'bp_core_setup_globals', 3 );
    166 add_action( '_admin_menu', 'bp_core_setup_globals', 3 ); // must be _admin_menu hook.
     165add_action( 'plugins_loaded', 'bp_core_setup_globals', 5 );
     166add_action( '_admin_menu', 'bp_core_setup_globals', 2 ); // must be _admin_menu hook.
    167167
    168168
     
    879879    if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
    880880        if ( function_exists('xprofile_install') ) {
    881             $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
     881            $fullname = xprofile_get_field_data( 1, $user_id );
    882882
    883883            if ( empty($fullname) || !$fullname ) {
    884884                $ud = get_userdata($user_id);
    885885
    886                 if ( empty( $ud->display_name ) )
     886                if ( !empty( $ud->display_name ) )
     887                    $fullname = $ud->display_name;
     888                else
    887889                    $fullname = $ud->user_nicename;
    888                 else
    889                     $fullname = $ud->display_name;
    890 
    891                 xprofile_set_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id, $fullname );
     890
     891                xprofile_set_field_data( 1, $user_id, $fullname );
    892892            }
    893893        } else {
    894894            $ud = get_userdata($user_id);
    895             $fullname = $ud->display_name;
     895           
     896            if ( !empty( $ud->display_name ) )
     897                $fullname = $ud->display_name;
     898            else
     899                $fullname = $ud->user_nicename;
    896900        }
    897 
     901       
    898902        wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' );
    899903    }
  • trunk/bp-core/bp-core-catchuri.php

    r1718 r1723  
    115115            unset($bp_uri[2]);
    116116        }
    117 
     117       
    118118        /* Reset the keys by merging with an empty array */
    119119        $bp_uri = array_merge( array(), $bp_uri );
    120 
    121120    }
    122121
  • trunk/bp-forums.php

    r1718 r1723  
    2727}
    2828add_action( 'plugins_loaded', 'bp_forums_setup', 5 );
    29 add_action( 'admin_head', 'bp_forums_setup', 3 );
     29add_action( 'admin_head', 'bp_forums_setup', 2 );
    3030
    3131function bp_forums_is_installed_correctly() {
  • trunk/bp-friends.php

    r1718 r1723  
    5252}
    5353add_action( 'plugins_loaded', 'friends_setup_globals', 5 );
    54 add_action( 'admin_menu', 'friends_setup_globals', 1 );
     54add_action( 'admin_menu', 'friends_setup_globals', 2 );
    5555
    5656function friends_check_installed() {   
  • trunk/bp-groups.php

    r1718 r1723  
    158158    bp_core_add_root_component( BP_GROUPS_SLUG );
    159159}
    160 add_action( 'plugins_loaded', 'groups_setup_root_component', 1 );
     160add_action( 'plugins_loaded', 'groups_setup_root_component', 2 );
    161161
    162162function groups_check_installed() {
  • trunk/bp-messages.php

    r1718 r1723  
    9090}
    9191add_action( 'plugins_loaded', 'messages_setup_globals', 5 );   
    92 add_action( 'admin_menu', 'messages_setup_globals', 1 );
     92add_action( 'admin_menu', 'messages_setup_globals', 2 );
    9393
    9494function messages_check_installed() {   
     
    102102        messages_install();
    103103}
    104 add_action( 'admin_menu', 'messages_check_installed', 1 );
     104add_action( 'admin_menu', 'messages_check_installed', 2 );
    105105
    106106function messages_setup_nav() {
  • trunk/bp-status.php

    r1718 r1723  
    1717}
    1818add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 );   
    19 add_action( 'admin_menu', 'bp_status_setup_globals', 1 );
     19add_action( 'admin_menu', 'bp_status_setup_globals', 2 );
    2020
    2121function bp_status_record_activity( $user_id, $content, $primary_link ) {
  • trunk/bp-wire.php

    r1718 r1723  
    2929}
    3030add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 );
    31 add_action( 'admin_menu', 'bp_wire_setup_globals', 1 );
     31add_action( 'admin_menu', 'bp_wire_setup_globals', 2 );
    3232
    3333function bp_wire_setup_nav() {
  • trunk/bp-wire/bp-wire-templatetags.php

    r1718 r1723  
    2020    function bp_wire_posts_template( $item_id, $component_slug, $can_post, $per_page, $max ) {
    2121        global $bp;
    22        
     22
    2323        if ( $bp->current_component == $bp->wire->slug ) {
    2424            $this->table_name = $bp->profile->table_name_wire;
     
    2828                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
    2929           
    30         } else {
     30        } else
    3131            $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;
    32         }
    3332       
    3433        $this->pag_page = isset( $_REQUEST['wpage'] ) ? intval( $_REQUEST['wpage'] ) : 1;
  • trunk/bp-xprofile.php

    r1718 r1723  
    144144    /* Register this in the active components array */
    145145    $bp->active_components[$bp->profile->slug] = $bp->profile->id;
    146        
     146
    147147    $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
    148148
     
    150150        $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
    151151}
    152 add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 );   
    153 add_action( 'admin_menu', 'xprofile_setup_globals', 1 );
     152add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 );
     153add_action( 'admin_menu', 'xprofile_setup_globals', 2 );
    154154
    155155/**
     
    812812    else
    813813        $field_id = xprofile_get_field_id_from_name( $field );
    814    
     814
    815815    if ( !$field_id )
    816816        return false;
  • trunk/bp-xprofile/bp-xprofile-classes.php

    r1661 r1723  
    697697        if ( !$user_id )
    698698            $user_id = $bp->displayed_user->id;
     699           
     700        if ( !$bp->profile )
     701            xprofile_setup_globals();
    699702
    700703        $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
Note: See TracChangeset for help on using the changeset viewer.