Changeset 1723
- Timestamp:
- 08/28/2009 07:05:23 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-blogs.php
r1718 r1723 122 122 } 123 123 add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 ); 124 add_action( 'admin_menu', 'bp_blogs_setup_globals', 1);124 add_action( 'admin_menu', 'bp_blogs_setup_globals', 2 ); 125 125 126 126 function bp_blogs_setup_root_component() { … … 128 128 bp_core_add_root_component( BP_BLOGS_SLUG ); 129 129 } 130 add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 1);130 add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 2 ); 131 131 132 132 /** … … 173 173 function bp_blogs_directory_blogs_setup() { 174 174 global $bp; 175 175 176 176 if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) { 177 177 $bp->is_directory = true; -
trunk/bp-core.php
r1721 r1723 163 163 $bp->current_component = $bp->default_component; 164 164 } 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.165 add_action( 'plugins_loaded', 'bp_core_setup_globals', 5 ); 166 add_action( '_admin_menu', 'bp_core_setup_globals', 2 ); // must be _admin_menu hook. 167 167 168 168 … … 879 879 if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) { 880 880 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 ); 882 882 883 883 if ( empty($fullname) || !$fullname ) { 884 884 $ud = get_userdata($user_id); 885 885 886 if ( empty( $ud->display_name ) ) 886 if ( !empty( $ud->display_name ) ) 887 $fullname = $ud->display_name; 888 else 887 889 $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 ); 892 892 } 893 893 } else { 894 894 $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; 896 900 } 897 901 898 902 wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' ); 899 903 } -
trunk/bp-core/bp-core-catchuri.php
r1718 r1723 115 115 unset($bp_uri[2]); 116 116 } 117 117 118 118 /* Reset the keys by merging with an empty array */ 119 119 $bp_uri = array_merge( array(), $bp_uri ); 120 121 120 } 122 121 -
trunk/bp-forums.php
r1718 r1723 27 27 } 28 28 add_action( 'plugins_loaded', 'bp_forums_setup', 5 ); 29 add_action( 'admin_head', 'bp_forums_setup', 3);29 add_action( 'admin_head', 'bp_forums_setup', 2 ); 30 30 31 31 function bp_forums_is_installed_correctly() { -
trunk/bp-friends.php
r1718 r1723 52 52 } 53 53 add_action( 'plugins_loaded', 'friends_setup_globals', 5 ); 54 add_action( 'admin_menu', 'friends_setup_globals', 1);54 add_action( 'admin_menu', 'friends_setup_globals', 2 ); 55 55 56 56 function friends_check_installed() { -
trunk/bp-groups.php
r1718 r1723 158 158 bp_core_add_root_component( BP_GROUPS_SLUG ); 159 159 } 160 add_action( 'plugins_loaded', 'groups_setup_root_component', 1);160 add_action( 'plugins_loaded', 'groups_setup_root_component', 2 ); 161 161 162 162 function groups_check_installed() { -
trunk/bp-messages.php
r1718 r1723 90 90 } 91 91 add_action( 'plugins_loaded', 'messages_setup_globals', 5 ); 92 add_action( 'admin_menu', 'messages_setup_globals', 1);92 add_action( 'admin_menu', 'messages_setup_globals', 2 ); 93 93 94 94 function messages_check_installed() { … … 102 102 messages_install(); 103 103 } 104 add_action( 'admin_menu', 'messages_check_installed', 1);104 add_action( 'admin_menu', 'messages_check_installed', 2 ); 105 105 106 106 function messages_setup_nav() { -
trunk/bp-status.php
r1718 r1723 17 17 } 18 18 add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 ); 19 add_action( 'admin_menu', 'bp_status_setup_globals', 1);19 add_action( 'admin_menu', 'bp_status_setup_globals', 2 ); 20 20 21 21 function bp_status_record_activity( $user_id, $content, $primary_link ) { -
trunk/bp-wire.php
r1718 r1723 29 29 } 30 30 add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 ); 31 add_action( 'admin_menu', 'bp_wire_setup_globals', 1);31 add_action( 'admin_menu', 'bp_wire_setup_globals', 2 ); 32 32 33 33 function bp_wire_setup_nav() { -
trunk/bp-wire/bp-wire-templatetags.php
r1718 r1723 20 20 function bp_wire_posts_template( $item_id, $component_slug, $can_post, $per_page, $max ) { 21 21 global $bp; 22 22 23 23 if ( $bp->current_component == $bp->wire->slug ) { 24 24 $this->table_name = $bp->profile->table_name_wire; … … 28 28 bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' ); 29 29 30 } else {30 } else 31 31 $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire; 32 }33 32 34 33 $this->pag_page = isset( $_REQUEST['wpage'] ) ? intval( $_REQUEST['wpage'] ) : 1; -
trunk/bp-xprofile.php
r1718 r1723 144 144 /* Register this in the active components array */ 145 145 $bp->active_components[$bp->profile->slug] = $bp->profile->id; 146 146 147 147 $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) ); 148 148 … … 150 150 $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire'; 151 151 } 152 add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 ); 153 add_action( 'admin_menu', 'xprofile_setup_globals', 1);152 add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 ); 153 add_action( 'admin_menu', 'xprofile_setup_globals', 2 ); 154 154 155 155 /** … … 812 812 else 813 813 $field_id = xprofile_get_field_id_from_name( $field ); 814 814 815 815 if ( !$field_id ) 816 816 return false; -
trunk/bp-xprofile/bp-xprofile-classes.php
r1661 r1723 697 697 if ( !$user_id ) 698 698 $user_id = $bp->displayed_user->id; 699 700 if ( !$bp->profile ) 701 xprofile_setup_globals(); 699 702 700 703 $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.