Skip to:
Content

BuddyPress.org

Ticket #3313: bag-o-fun.patch

File bag-o-fun.patch, 71.7 KB (added by johnjamesjacoby, 13 years ago)
  • bp-activity/bp-activity-notifications.php

     
    4646                        // Set up and send the message
    4747                        $ud       = bp_core_get_core_userdata( $receiver_user_id );
    4848                        $to       = $ud->user_email;
    49                         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     49                        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    5050                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
    5151
    5252$message = sprintf( __(
     
    9292                // Set up and send the message
    9393                $ud       = bp_core_get_core_userdata( $original_activity->user_id );
    9494                $to       = $ud->user_email;
    95                 $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     95                $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    9696                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
    9797
    9898$message = sprintf( __(
     
    134134                // Set up and send the message
    135135                $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
    136136                $to       = $ud->user_email;
    137                 $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     137                $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    138138                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
    139139
    140140                $poster_name = stripslashes( $poster_name );
  • bp-blogs/bp-blogs-functions.php

     
    291291        if ( empty( $blog_id ) && isset( $wpdb->blogid ) )
    292292                $blog_id = $wpdb->blogid;
    293293        else
    294                 $blog_id = BP_ROOT_BLOG;
    295  No newline at end of file
     294                $blog_id = bp_get_root_blog_id();
     295 No newline at end of file
    296296
    297297        if ( empty( $role ) ) {
  • bp-blogs/bp-blogs-widgets.php

     		$key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
     
    88function bp_blogs_register_widgets() {
    99        global $wpdb, $bp;
    1010
    11         if ( bp_is_active( 'activity' ) && (int)$wpdb->blogid == BP_ROOT_BLOG )
    12  No newline at end of file
     11        if ( bp_is_active( 'activity' ) && (int)$wpdb->blogid == bp_get_root_blog_id() )
     12 No newline at end of file
    1313                add_action('widgets_init', create_function('', 'return register_widget("BP_Blogs_Recent_Posts_Widget");') );
    1414}
  • bp-core/admin/bp-core-update.php

     add_action( 'bp_register_widgets', 'bp_blogs_register_widgets' );
     
    776776                        if ( isset( $_POST['bp_components']['blogs'] ) ) {
    777777                                $active_components['blogs'] = 1;
    778778
    779                                 // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
    780                                 if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
    781                                         switch_to_blog( BP_ROOT_BLOG );
     779                                // Make sure that the pages are created on the bp_get_root_blog_id(), no matter which Dashboard the setup is being run on
     780                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
     781                                        switch_to_blog( bp_get_root_blog_id() );
    782782
    783783                                // Move bp-pages data from the blog options table to site options
    784784                                $existing_pages = bp_get_option( 'bp-pages' );
     
    788788
    789789                                bp_update_option( 'bp-pages', $existing_pages );
    790790
    791                                 if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
     791                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
    792792                                        restore_current_blog();
    793793
    794794                                bp_core_install( $active_components );
     
    830830                if ( isset( $_POST['submit'] ) && isset( $_POST['bp_pages'] ) ) {
    831831                        check_admin_referer( 'bpwizard_pages' );
    832832
    833                         // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
    834                         if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
    835                                 switch_to_blog( BP_ROOT_BLOG );
     833                        // Make sure that the pages are created on the bp_get_root_blog_id(), no matter which Dashboard the setup is being run on
     834                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
     835                                switch_to_blog( bp_get_root_blog_id() );
    836836
    837837                        // Delete any existing pages
    838838                        $existing_pages = bp_core_update_get_page_meta( 'bp-pages' );
     
    843843                        $blog_pages   = $this->setup_pages( (array)$_POST['bp_pages'] );
    844844                        bp_update_option( 'bp-pages', $blog_pages );
    845845
    846                         if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
     846                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
    847847                                restore_current_blog();
    848848
    849849                        return true;
     
    957957                if ( isset( $_POST['submit'] ) && isset( $_POST['theme'] ) ) {
    958958                        check_admin_referer( 'bpwizard_theme' );
    959959
    960                         if ( is_multisite() && BP_ROOT_BLOG != get_current_blog_id() )
    961                                 switch_to_blog( BP_ROOT_BLOG );
     960                        if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
     961                                switch_to_blog( bp_get_root_blog_id() );
    962962
    963963                        switch ( $_POST['theme'] ) {
    964964
  • bp-core/bp-core-adminbar.php

     
    5656        // Create the root blog menu
    5757        $wp_admin_bar->add_menu( array(
    5858                'id'    => 'bp-root-blog',
    59                 'title' => get_blog_option( BP_ROOT_BLOG, 'blogname' ),
     59                'title' => get_blog_option( bp_get_root_blog_id(), 'blogname' ),
    6060                'href'  => bp_get_root_domain()
    6161        ) );
    6262
     
    7171                                'id' => 'dashboard',
    7272                                'parent' => 'bp-root-blog',
    7373                                'title' => __( 'Admin Dashboard', 'buddypress' ),
    74                                 'href' => get_admin_url( BP_ROOT_BLOG )
    75  No newline at end of file
     74                                'href' => get_admin_url( bp_get_root_blog_id() )
     75 No newline at end of file
    7676                        ) );
    7777
  • bp-core/bp-core-avatars.php

     			// Add network admin link
     
    641641                $basedir = $upload_dir['basedir'];
    642642
    643643                // If multisite, and current blog does not match root blog, make adjustments
    644                 if ( is_multisite() && BP_ROOT_BLOG != get_current_blog_id() )
    645                         $basedir = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     644                if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
     645                        $basedir = get_blog_option( bp_get_root_blog_id(), 'upload_path' );
    646646        }
    647647
    648648        return apply_filters( 'bp_core_avatar_upload_path', $basedir );
     
    668668                $baseurl = $upload_dir['baseurl'];
    669669
    670670                // If multisite, and current blog does not match root blog, make adjustments
    671                 if ( is_multisite() && BP_ROOT_BLOG != get_current_blog_id() )
    672                         $baseurl = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
    673  No newline at end of file
     671                if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
     672                        $baseurl = trailingslashit( get_blog_option( bp_get_root_blog_id(), 'home' ) ) . get_blog_option( bp_get_root_blog_id(), 'upload_path' );
     673 No newline at end of file
    674674        }
    675675
  • bp-core/bp-core-buddybar.php

     	return apply_filters( 'bp_core_avatar_url', $baseurl );
     
    200200                'user_has_access' => $user_has_access,
    201201                'screen_function' => &$screen_function
    202202        );
    203        
    204         /**
    205          * The last step is to hook the screen function for the added subnav item. But this only
    206          * needs to be done if this subnav item is the current view, and the user has access to the
    207          * subnav item. We figure out whether we're currently viewing this subnav by checking the
    208          * following two conditions:
    209          *   (1) Either:
    210          *       (a) the parent slug matches the current_component, or
    211          *       (b) the parent slug matches the current_item
    212          *   (2) And either:
    213          *       (a) the current_action matches $slug, or
    214          *       (b) there is no current_action (ie, this is the default subnav for the parent nav)
    215          *           and this subnav item is the default for the parent item (which we check by
    216          *           comparing this subnav item's screen function with the screen function of the
    217          *           parent nav item in $bp->bp_nav). This condition only arises when viewing a
    218          *           user, since groups should always have an action set.
    219          */
    220        
    221         // If we *don't* meet condition (1), return
    222         if ( $bp->current_component != $parent_slug && $bp->current_item != $parent_slug )
    223                 return;
    224                
    225         // If we *do* meet condition (2), then the added subnav item is currently being requested
    226         if ( ( !empty( $bp->current_action ) && $slug == $bp->current_action ) || ( bp_is_user() && empty( $bp->current_action ) && $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) {
    227        
    228                 // Before hooking the screen function, check user access
    229                 if ( $user_has_access ) {
    230                         if ( !is_object( $screen_function[0] ) )
    231                                 add_action( 'bp_screens', $screen_function );
    232                         else
    233                                 add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
    234                 } else {
    235                         // When the content is off-limits, we handle the situation differently
    236                         // depending on whether the current user is logged in
    237                         if ( is_user_logged_in() ) {
    238                                 // Off-limits to this user. Throw an error and redirect to the displayed user's domain                 
    239                                 bp_core_no_access( array(
    240                                         'message'       => __( 'You do not have access to this page.', 'buddypress' ),
    241                                         'root'          => bp_displayed_user_domain(),
    242                                         'redirect'      => false
    243                                 ) );
    244                         } else {
    245                                 // Not logged in. Allow the user to log in, and attempt to redirect
    246                                 bp_core_no_access();
    247                         }
    248                 }
     203
     204        // Look for current component
     205        if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
     206                if ( !is_object( $screen_function[0] ) )
     207                        add_action( 'bp_screens', $screen_function );
     208                else
     209                        add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
     210
     211        // Look for current item
     212        } elseif ( ( $bp->current_action == $slug && $bp->current_item == $parent_slug ) && $user_has_access ) {
     213                if ( !is_object( $screen_function[0] ) )
     214                        add_action( 'bp_screens', $screen_function );
     215                else
     216                        add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
    249217        }
    250218}
    251219
     
    378346function bp_adminbar_logo() {
    379347        global $bp;
    380348
    381         echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '</a>';
    382  No newline at end of file
     349        echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
     350 No newline at end of file
    383351}
    384352
  • bp-core/bp-core-catchuri.php

     // **** "Log In" and "Sign Up" links (Visible when not logged in) ********
     
    3636        // Only catch URI's on the root blog if we are not running
    3737        // on multiple blogs
    3838        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
    39                 if ( BP_ROOT_BLOG != (int) $wpdb->blogid )
     39                if ( bp_get_root_blog_id() != (int) $wpdb->blogid )
    4040                        return false;
    4141        }
    4242
     
    6666                if ( empty( $bp_uri[$key] ) ) unset( $bp_uri[$key] );
    6767
    6868        // Running off blog other than root
    69         if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) ) {
    70  No newline at end of file
     69        if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != bp_get_root_blog_id() ) ) {
     70 No newline at end of file
    7171
    7272                // Any subdirectory names must be removed from $bp_uri.
  • bp-core/bp-core-cssjs.php

     		// This includes two cases: (1) when WP is installed in a subdirectory,
     
    3434function bp_core_confirmation_js() {
    3535        global $wpdb;
    3636
    37         if ( is_multisite() && $wpdb->blogid != BP_ROOT_BLOG )
     37        if ( is_multisite() && $wpdb->blogid != bp_get_root_blog_id() )
    3838                return false;
    3939
    4040        if ( !wp_script_is( 'jquery' ) )
  • bp-core/bp-core-filters.php

     
    3535 * @return The blog name for the root blog
    3636 */
    3737function bp_core_email_from_name_filter() {
    38         return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES ) );
     38        return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES ) );
    3939}
    4040add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
    4141
     
    7171        if ( !is_super_admin() )
    7272                return $themes;
    7373
    74         if ( $wpdb->blogid == BP_ROOT_BLOG ) {
     74        if ( $wpdb->blogid == bp_get_root_blog_id() ) {
    7575                $themes['bp-default'] = 1;
    7676        }
    7777       
     
    126126function bp_core_login_redirect( $redirect_to ) {
    127127        global $bp, $wpdb;
    128128
    129         if ( is_multisite() && $wpdb->blogid != BP_ROOT_BLOG )
    130  No newline at end of file
     129        if ( is_multisite() && $wpdb->blogid != bp_get_root_blog_id() )
     130 No newline at end of file
    131131                return $redirect_to;
    132132
  • bp-core/bp-core-functions.php

     	if ( isset( $_REQUEST['redirect_to'] ) && ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) ) )
     
    1111 * @package BuddyPress
    1212 * @since 1.3
    1313 *
    14  * @uses bp_get_option_blog_id()
     14 * @uses bp_get_root_blog_id()
    1515 * @param str $option_name The option to be retrieved
    1616 * @param str $default Optional. Default value to be returned if the option isn't set
    1717 * @return mixed The value for the option
    1818 */
    1919function bp_get_option( $option_name, $default = '' ) {
    20         $value = get_blog_option( bp_get_option_blog_id( $option_name ), $option_name, $default );
     20        $value = get_blog_option( bp_get_root_blog_id(), $option_name, $default );
    2121       
    2222        return apply_filters( 'bp_get_option', $value );
    2323}
     
    3131 * @package BuddyPress
    3232 * @since 1.3
    3333 *
    34  * @uses bp_get_option_blog_id()
     34 * @uses bp_get_root_blog_id()
    3535 * @param str $option_name The option key to be set
    3636 * @param str $value The value to be set
    3737 */
    3838function bp_update_option( $option_name, $value ) {
    39         // update_blog_option() does not return anything on success/failure, so neither can we
    40         update_blog_option( bp_get_option_blog_id( $option_name ), $option_name, $value );
     39        update_blog_option( bp_get_root_blog_id(), $option_name, $value );
    4140}
    4241
    4342/**
     
    4948 * @package BuddyPress
    5049 * @since 1.3
    5150 *
    52  * @uses bp_get_option_blog_id()
     51 * @uses bp_get_root_blog_id()
    5352 * @param str $option_name The option key to be set
    5453 */
    5554function bp_delete_option( $option_name ) {
    56         // update_blog_option() does not return anything on success/failure, so neither can we
    57         delete_blog_option( bp_get_option_blog_id( $option_name ), $option_name );
     55        delete_blog_option( bp_get_root_blog_id(), $option_name );
    5856}
    5957
    6058/**
    61  * Retrieve the filterable blog_id of the blog where the option is question is saved
    62  *
    63  * Since BP 1.3, BuddyPress has stored all of its settings in blog options tables, as opposed to
    64  * sitemeta. This makes it easier for non-standard setups (like BP_ENABLE_MULTIBLOG and
    65  * multinetwork BP) to save and access options in a consistent and logical way.
    66  *
    67  * By default, nearly all settings are stored in the options table of BP_ROOT_BLOG. The one
    68  * exception is when BP_ENABLE_MULTIBLOG is enabled. In this case, bp-pages - the list of pages that
    69  * are associated with BP top-level components - must be specific to each blog in the network. If
    70  * you are building a plugin that requires an option (either a BP-native option, or your own custom
    71  * option) to be specific to each blog in a network, filter 'bp_blog_specific_options' and add your
    72  * option's name. This will allow you to use bp_get_option() and bp_update_option() seamlessly.
    73  *
    74  * @package BuddyPress
    75  * @since 1.3
    76  *
    77  * @see bp_get_option()
    78  * @see bp_update_option()
    79  * @uses apply_filters() Filter bp_get_option_blog_id to change this setting
    80  * @return int $blog_id
    81  */
    82 function bp_get_option_blog_id( $option_name ) {
    83         $blog_specific_options = apply_filters( 'bp_blog_specific_options', array(
    84                 'bp-pages'
    85         ) );
    86        
    87         if ( in_array( $option_name, $blog_specific_options ) ) {
    88                 if ( defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ) {
    89                         $blog_id = get_current_blog_id();
    90                 } else {
    91                         $blog_id = BP_ROOT_BLOG;
    92                 }
    93         } else {
    94                 $blog_id = BP_ROOT_BLOG;
    95         }
    96 
    97         return apply_filters( 'bp_get_option_blog_id', $blog_id );
    98 }
    99 
    100 /**
    10159 * Allow filtering of database prefix. Intended for use in multinetwork installations.
    10260 *
    10361 * @global object $wpdb WordPress database object
     
    12583        if ( !isset( $page_ids['members'] ) && $ms_page_ids = get_site_option( 'bp-pages' ) ) {
    12684                $is_enable_multiblog = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? true : false;
    12785 
    128                 $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : BP_ROOT_BLOG;
     86                $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : bp_get_root_blog_id();
    12987
    13088                if ( isset( $ms_page_ids[$page_blog_id] ) ) {
    13189                        $page_ids = $ms_page_ids[$page_blog_id];
     
    14199 * Stores BP pages in the meta table, depending on setup
    142100 *
    143101 * bp-pages data is stored in site_options (falls back to options on non-MS), in an array keyed by
    144  * blog_id. This allows you to change your BP_ROOT_BLOG and go through the setup process again.
     102 * blog_id. This allows you to change your bp_get_root_blog_id() and go through the setup process again.
    145103 *
    146104 * @package BuddyPress Core
    147105 * @since 1.3
     
    169127        // Get pages and IDs
    170128        if ( $page_ids = bp_core_get_page_meta() ) {
    171129
    172                 $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
     130                $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
    173131                $page_ids_sql     = implode( ',', (array)$page_ids );
    174132                $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
    175133
     
    512470function bp_core_get_root_domain() {
    513471        global $wpdb;
    514472
    515         if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
    516                 $domain = get_home_url( $wpdb->blogid );
    517         else
    518                 $domain = get_home_url( BP_ROOT_BLOG );
     473        $domain = get_home_url( bp_get_root_blog_id() );
    519474
    520475        return apply_filters( 'bp_core_get_root_domain', $domain );
    521476}
     
    10961051}
    10971052
    10981053/**
    1099  * Is this BP_ROOT_BLOG?
     1054 * Is this the root blog ID?
    11001055 *
    11011056 * @package BuddyPress
    11021057 * @since 1.3
    11031058 *
    11041059 * @param int $blog_id Optional. Defaults to the current blog id.
    1105  * @return bool $is_root_blog Returns true if this is BP_ROOT_BLOG.
     1060 * @return bool $is_root_blog Returns true if this is bp_get_root_blog_id().
    11061061 */
    1107 function bp_is_root_blog( $blog_id = false ) {
    1108         $is_root_blog = true;
     1062function bp_is_root_blog( $blog_id = 0 ) {
     1063       
     1064        // Assume false
     1065        $is_root_blog = false;
    11091066
    1110         if ( !$blog_id )
     1067        // Use current blog if no ID is passed
     1068        if ( empty( $blog_id ) )
    11111069                $blog_id = get_current_blog_id();
    11121070
    1113         if ( $blog_id != BP_ROOT_BLOG )
    1114                 $is_root_blog = false;
     1071        // Compare to root blog ID
     1072        if ( $blog_id == bp_get_root_blog_id() )
     1073                $is_root_blog = true;
    11151074
    1116         return apply_filters( 'bp_is_root_blog', $is_root_blog );
     1075        return apply_filters( 'bp_is_root_blog', (bool) $is_root_blog );
    11171076}
    11181077
    11191078/**
     1079 * Is this bp_get_root_blog_id()?
     1080 *
     1081 * @package BuddyPress
     1082 * @since 1.3
     1083 *
     1084 * @param int $blog_id Optional. Defaults to the current blog id.
     1085 * @return bool $is_root_blog Returns true if this is bp_get_root_blog_id().
     1086 */
     1087function bp_get_root_blog_id( $blog_id = false ) {
     1088
     1089        // Define on which blog ID BuddyPress should run
     1090        if ( !defined( 'BP_ROOT_BLOG' ) ) {
     1091
     1092                // Root blog is the main site on this network
     1093                if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
     1094                        $current_site = get_current_site();
     1095                        $root_blog_id = $current_site->blog_id;
     1096
     1097                // Root blog is every site on this network
     1098                } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
     1099                        $root_blog_id = get_current_blog_id();
     1100
     1101                // Root blog is the only blog on this network
     1102                } elseif( !is_multisite() ) {
     1103                        $root_blog_id = 1;
     1104                }
     1105
     1106                define( 'BP_ROOT_BLOG', $root_blog_id );
     1107               
     1108        // Root blog is defined
     1109        } else {
     1110                $root_blog_id = BP_ROOT_BLOG;
     1111        }
     1112
     1113        return apply_filters( 'bp_get_root_blog_id', (int) $root_blog_id );
     1114}
     1115
     1116/**
    11201117 * Get the meta_key for a given piece of user metadata
    11211118 *
    11221119 * BuddyPress stores a number of pieces of userdata in the WordPress central usermeta table. In
  • bp-core/bp-core-template.php

     
    168168        // Get GMT offset from root blog
    169169        $root_blog_offset = false;
    170170        if ( $localize_time )
    171                 $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
    172  No newline at end of file
     171                $root_blog_offset = get_blog_option( bp_get_root_blog_id(), 'gmt_offset' );
     172 No newline at end of file
    173173
    174174        // Calculate offset time
  • bp-core/bp-core-wpabstraction.php

     	$time_offset = $time + ( $root_blog_offset * 3600 );
     
    3232
    3333        if ( !function_exists( 'switch_to_blog' ) ) {
    3434                function switch_to_blog() {
    35                         return 1;
     35                        return bp_get_root_blog_id();
    3636                }
    3737        }
    3838
    3939        if ( !function_exists( 'restore_current_blog' ) ) {
    4040                function restore_current_blog() {
    41                         return 1;
    42  No newline at end of file
     41                        return bp_get_root_blog_id();
     42 No newline at end of file
    4343                }
    4444        }
  • bp-forums/bp-forums-admin.php

     
     
    189189        $file .= "\n" .   '$bb->custom_user_table = \'' . $wpdb->users . '\';';
    190190        $file .= "\n" .   '$bb->custom_user_meta_table = \'' . $wpdb->usermeta . '\';';
    191191        $file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
    192         $file .= "\n" .   '$bb->name = \'' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
     192        $file .= "\n" .   '$bb->name = \'' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
    193193
    194194        if ( is_multisite() )
    195                 $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
     195                $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . bp_get_root_blog_id() . ';';
    196196
    197197        if ( defined( 'AUTH_SALT' ) )
    198198                $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', \'' . addslashes( AUTH_SALT ) . '\');';
  • bp-forums/bp-forums-bbpress-sa.php

     
    8383
    8484        // Set a site id if there isn't one already
    8585        if ( !isset( $bb->site_id ) )
    86                 $bb->site_id = BP_ROOT_BLOG;
    87  No newline at end of file
     86                $bb->site_id = bp_get_root_blog_id();
     87 No newline at end of file
    8888
    8989        // Check if the tables are installed, if not, install them
  • bp-friends/bp-friends-notifications.php

     	if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) ) {
     
    1818
    1919        // Set up and send the message
    2020        $to       = $ud->user_email;
    21         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     21        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    2222        $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
    2323
    2424        $message = sprintf( __(
     
    6060
    6161        // Set up and send the message
    6262        $to       = $ud->user_email;
    63         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    64  No newline at end of file
     63        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
     64 No newline at end of file
    6565        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
    6666
  • bp-groups/bp-groups-notifications.php

     	$message = sprintf( __(
     
    44        global $bp;
    55
    66        $group    = new BP_Groups_Group( $group_id );
    7         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     7        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    88        $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
    99
    1010        $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
     
    111111
    112112        // Set up and send the message
    113113        $to       = $ud->user_email;
    114         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     114        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    115115
    116116        if ( $accepted ) {
    117117                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
     
    171171
    172172        // Set up and send the message
    173173        $to       = $ud->user_email;
    174         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     174        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    175175        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
    176176
    177177        $message = sprintf( __(
     
    221221
    222222                // Set up and send the message
    223223                $to       = $invited_ud->user_email;
    224                 $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     224                $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    225225                $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
    226226
    227227                $message = sprintf( __(
     
    283283                        // Set up and send the message
    284284                        $ud = bp_core_get_core_userdata( $receiver_user_id );
    285285                        $to = $ud->user_email;
    286                         $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     286                        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
    287287                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
    288288
    289289$message = sprintf( __(
  • bp-languages/buddypress.pot

     
    44msgstr ""
    55"Project-Id-Version: BuddyPress \n"
    66"Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
    7 "POT-Creation-Date: 2011-07-04 15:30:55+00:00\n"
     7"POT-Creation-Date: 2011-07-02 11:30:54+00:00\n"
    88"MIME-Version: 1.0\n"
    99"Content-Type: text/plain; charset=UTF-8\n"
    1010"Content-Transfer-Encoding: 8bit\n"
     
    3030msgstr ""
    3131
    3232#: bp-blogs/bp-blogs-loader.php:147 bp-blogs/bp-blogs-loader.php:168
    33 #: bp-blogs/bp-blogs-buddybar.php:23 bp-core/bp-core-adminbar.php:103
     33#: bp-blogs/bp-blogs-buddybar.php:23
    3434msgid "My Sites"
    3535msgstr ""
    3636
     
    4646msgid "New post comment posted"
    4747msgstr ""
    4848
    49 #: bp-blogs/bp-blogs-buddybar.php:35 bp-core/bp-core-adminbar.php:115
    50 #: bp-core/admin/bp-core-admin.php:28 bp-core/bp-core-buddybar.php:457
     49#: bp-blogs/bp-blogs-buddybar.php:35 bp-core/admin/bp-core-admin.php:28
     50#: bp-core/bp-core-buddybar.php:425
    5151msgid "Dashboard"
    5252msgstr ""
    5353
    54 #: bp-blogs/bp-blogs-buddybar.php:36 bp-core/bp-core-adminbar.php:118
    55 #: bp-core/bp-core-buddybar.php:461
     54#: bp-blogs/bp-blogs-buddybar.php:36 bp-core/bp-core-buddybar.php:429
    5655msgid "New Post"
    5756msgstr ""
    5857
    59 #: bp-blogs/bp-blogs-buddybar.php:37 bp-core/bp-core-buddybar.php:462
     58#: bp-blogs/bp-blogs-buddybar.php:37 bp-core/bp-core-buddybar.php:430
    6059msgid "Manage Posts"
    6160msgstr ""
    6261
    63 #: bp-blogs/bp-blogs-buddybar.php:38 bp-core/bp-core-adminbar.php:119
    64 #: bp-core/bp-core-buddybar.php:463
     62#: bp-blogs/bp-blogs-buddybar.php:38 bp-core/bp-core-buddybar.php:431
    6563msgid "Manage Comments"
    6664msgstr ""
    6765
     
    147145#: bp-blogs/bp-blogs-template.php:467 bp-core/admin/bp-core-admin.php:89
    148146#: bp-core/admin/bp-core-admin.php:99 bp-core/admin/bp-core-admin.php:107
    149147#: bp-core/admin/bp-core-admin.php:115 bp-core/admin/bp-core-admin.php:125
    150 #: bp-core/admin/bp-core-admin.php:137 bp-friends/bp-friends-screens.php:69
    151 #: bp-groups/bp-groups-screens.php:822 bp-messages/bp-messages-screens.php:148
     148#: bp-core/admin/bp-core-admin.php:137 bp-core/admin/bp-core-admin.php:149
     149#: bp-friends/bp-friends-screens.php:69 bp-groups/bp-groups-screens.php:822
     150#: bp-messages/bp-messages-screens.php:148
    152151#: bp-themes/bp-default/registration/register.php:205
    153152#: bp-themes/bp-default/groups/single/admin.php:26
    154153#: bp-activity/bp-activity-screens.php:170
     
    158157#: bp-blogs/bp-blogs-template.php:471 bp-core/admin/bp-core-admin.php:90
    159158#: bp-core/admin/bp-core-admin.php:100 bp-core/admin/bp-core-admin.php:108
    160159#: bp-core/admin/bp-core-admin.php:116 bp-core/admin/bp-core-admin.php:126
    161 #: bp-core/admin/bp-core-admin.php:138 bp-friends/bp-friends-screens.php:70
    162 #: bp-groups/bp-groups-screens.php:823 bp-messages/bp-messages-screens.php:149
     160#: bp-core/admin/bp-core-admin.php:138 bp-core/admin/bp-core-admin.php:150
     161#: bp-friends/bp-friends-screens.php:70 bp-groups/bp-groups-screens.php:823
     162#: bp-messages/bp-messages-screens.php:149
    163163#: bp-themes/bp-default/registration/register.php:206
    164164#: bp-themes/bp-default/groups/single/admin.php:27
    165165#: bp-activity/bp-activity-screens.php:171
     
    174174msgid "<a href=\"%1$s\">%2$s</a> is your new site.  <a href=\"%3$s\">Login</a> as \"%4$s\" using your existing password."
    175175msgstr ""
    176176
    177 #: bp-blogs/bp-blogs-template.php:538 bp-core/bp-core-filters.php:311
     177#: bp-blogs/bp-blogs-template.php:538 bp-core/bp-core-filters.php:312
    178178#: bp-themes/bp-default/blogs/index.php:21
    179179#: bp-themes/bp-default/blogs/create.php:21
    180180msgid "Create a Site"
     
    200200msgstr ""
    201201
    202202#: bp-blogs/bp-blogs-template.php:601 bp-blogs/bp-blogs-template.php:602
    203 #: bp-core/bp-core-adminbar.php:122
    204203msgid "Visit Site"
    205204msgstr ""
    206205
    207 #: bp-blogs/bp-blogs-functions.php:110
     206#: bp-blogs/bp-blogs-functions.php:103
    208207msgid "%s created the site %s"
    209208msgstr ""
    210209
    211 #: bp-blogs/bp-blogs-functions.php:174
     210#: bp-blogs/bp-blogs-functions.php:167
    212211msgid "%1$s wrote a new post, %2$s, on the site %3$s"
    213212msgstr ""
    214213
    215 #: bp-blogs/bp-blogs-functions.php:176
     214#: bp-blogs/bp-blogs-functions.php:169
    216215msgid "%1$s wrote a new post, %2$s"
    217216msgstr ""
    218217
    219 #: bp-blogs/bp-blogs-functions.php:253
     218#: bp-blogs/bp-blogs-functions.php:246
    220219msgid "%1$s commented on the post, %2$s, on the site %3$s"
    221220msgstr ""
    222221
    223 #: bp-blogs/bp-blogs-functions.php:255
     222#: bp-blogs/bp-blogs-functions.php:248
    224223msgid "%1$s commented on the post, %2$s"
    225224msgstr ""
    226225
     
    242241
    243242#: bp-core/bp-core-widgets.php:21 bp-core/bp-core-widgets.php:110
    244243#: bp-core/admin/bp-core-update.php:427 bp-core/bp-core-template.php:242
    245 #: bp-groups/bp-groups-template.php:1253 bp-members/bp-members-loader.php:26
     244#: bp-members/bp-members-loader.php:26
    246245#: bp-themes/bp-default/groups/single/admin.php:229
    247246msgid "Members"
    248247msgstr ""
     
    322321msgid "There were no members found, please try another filter."
    323322msgstr ""
    324323
    325 #: bp-core/bp-core-adminbar.php:73
    326 msgid "Admin Dashboard"
    327 msgstr ""
    328 
    329 #: bp-core/bp-core-adminbar.php:84
    330 msgid "Network Dashboard"
    331 msgstr ""
    332 
    333 #: bp-core/bp-core-adminbar.php:110
    334 msgid "Blavatar"
    335 msgstr ""
    336 
    337 #: bp-core/bp-core-adminbar.php:140
    338 msgid "Comments %s"
    339 msgstr ""
    340 
    341 #: bp-core/bp-core-adminbar.php:154
    342 msgid "Appearance"
    343 msgstr ""
    344 
    345 #: bp-core/bp-core-adminbar.php:160
    346 msgid "Themes"
    347 msgstr ""
    348 
    349 #: bp-core/bp-core-adminbar.php:163
    350 msgid "Widgets"
    351 msgstr ""
    352 
    353 #: bp-core/bp-core-adminbar.php:166
    354 msgid "Menus"
    355 msgstr ""
    356 
    357 #: bp-core/bp-core-adminbar.php:169
    358 msgid "Background"
    359 msgstr ""
    360 
    361 #: bp-core/bp-core-adminbar.php:172
    362 msgid "Header"
    363 msgstr ""
    364 
    365 #: bp-core/bp-core-adminbar.php:205
    366 msgid "%d WordPress Update"
    367 msgstr ""
    368 
    369 #: bp-core/bp-core-adminbar.php:207
    370 msgid "%d Plugin Update"
    371 msgid_plural "%d Plugin Updates"
    372 msgstr[0] ""
    373 msgstr[1] ""
    374 
    375 #: bp-core/bp-core-adminbar.php:209
    376 msgid "%d Theme Update"
    377 msgid_plural "%d Theme Updates"
    378 msgstr[0] ""
    379 msgstr[1] ""
    380 
    381 #: bp-core/bp-core-adminbar.php:214
    382 msgid "Updates %s"
    383 msgstr ""
    384 
    385324#: bp-core/admin/bp-core-schema.php:207
    386325msgctxt "First XProfile group name"
    387326msgid "Base"
     
    405344msgid "BuddyPress General Settings"
    406345msgstr ""
    407346
    408 #: bp-core/admin/bp-core-admin.php:74 bp-core/admin/bp-core-admin.php:215
     347#: bp-core/admin/bp-core-admin.php:74 bp-core/admin/bp-core-admin.php:227
    409348msgid "Settings Saved"
    410349msgstr ""
    411350
     
    426365msgstr ""
    427366
    428367#: bp-core/admin/bp-core-admin.php:123
    429 msgid "Disable activity stream commenting on blog and forum posts?"
     368msgid "Disable global forum directory?"
    430369msgstr ""
    431370
    432371#: bp-core/admin/bp-core-admin.php:135
     372msgid "Disable activity stream commenting on blog and forum posts?"
     373msgstr ""
     374
     375#: bp-core/admin/bp-core-admin.php:147
    433376msgid "Restrict group creation to Site Admins?"
    434377msgstr ""
    435378
    436 #: bp-core/admin/bp-core-admin.php:152 bp-core/admin/bp-core-admin.php:231
     379#: bp-core/admin/bp-core-admin.php:164 bp-core/admin/bp-core-admin.php:243
    437380msgid "Save Settings"
    438381msgstr ""
    439382
    440 #: bp-core/admin/bp-core-admin.php:209
     383#: bp-core/admin/bp-core-admin.php:221
    441384msgid "BuddyPress Component Settings"
    442385msgstr ""
    443386
    444 #: bp-core/admin/bp-core-admin.php:261 bp-xprofile/bp-xprofile-loader.php:27
     387#: bp-core/admin/bp-core-admin.php:273 bp-xprofile/bp-xprofile-loader.php:27
    445388msgid "Extended Profiles"
    446389msgstr ""
    447390
    448 #: bp-core/admin/bp-core-admin.php:262
     391#: bp-core/admin/bp-core-admin.php:274
    449392msgid "Customize your community with fully editable profile fields that allow your users use to uniquely describe themselves."
    450393msgstr ""
    451394
    452 #: bp-core/admin/bp-core-admin.php:265
     395#: bp-core/admin/bp-core-admin.php:277
    453396msgid "Account Settings"
    454397msgstr ""
    455398
    456 #: bp-core/admin/bp-core-admin.php:266
     399#: bp-core/admin/bp-core-admin.php:278
    457400msgid "Allow your users to modify their account and notification settings directly from within their profiles."
    458401msgstr ""
    459402
    460 #: bp-core/admin/bp-core-admin.php:269 bp-friends/bp-friends-loader.php:26
     403#: bp-core/admin/bp-core-admin.php:281 bp-friends/bp-friends-loader.php:26
    461404msgid "Friend Connections"
    462405msgstr ""
    463406
    464 #: bp-core/admin/bp-core-admin.php:270
     407#: bp-core/admin/bp-core-admin.php:282
    465408msgid "Let your users make connections so they can track the activity of others and focus on the people they care about the most."
    466409msgstr ""
    467410
    468 #: bp-core/admin/bp-core-admin.php:273
     411#: bp-core/admin/bp-core-admin.php:285
    469412msgid "Private Messaging"
    470413msgstr ""
    471414
    472 #: bp-core/admin/bp-core-admin.php:274
     415#: bp-core/admin/bp-core-admin.php:286
    473416msgid "Allow your users to talk to each other directly and in private. They are not just limited to one-on-one discussions, and can send messages to multiple recipients."
    474417msgstr ""
    475418
    476 #: bp-core/admin/bp-core-admin.php:277 bp-activity/bp-activity-loader.php:26
     419#: bp-core/admin/bp-core-admin.php:289 bp-activity/bp-activity-loader.php:26
    477420msgid "Activity Streams"
    478421msgstr ""
    479422
    480 #: bp-core/admin/bp-core-admin.php:278
     423#: bp-core/admin/bp-core-admin.php:290
    481424msgid "Global, personal, and group activity streams with threaded commenting, direct posting, favoriting and @mentions, all with full RSS feed and email notification support."
    482425msgstr ""
    483426
    484 #: bp-core/admin/bp-core-admin.php:281 bp-groups/bp-groups-loader.php:29
     427#: bp-core/admin/bp-core-admin.php:293 bp-groups/bp-groups-loader.php:29
    485428msgid "User Groups"
    486429msgstr ""
    487430
    488 #: bp-core/admin/bp-core-admin.php:282
     431#: bp-core/admin/bp-core-admin.php:294
    489432msgid "Groups allow your users to organize themselves into specific public, private or hidden sections with a separate activity stream and member listing."
    490433msgstr ""
    491434
    492 #: bp-core/admin/bp-core-admin.php:285 bp-forums/bp-forums-loader.php:26
     435#: bp-core/admin/bp-core-admin.php:297 bp-forums/bp-forums-loader.php:26
    493436msgid "Discussion Forums"
    494437msgstr ""
    495438
    496 #: bp-core/admin/bp-core-admin.php:286
     439#: bp-core/admin/bp-core-admin.php:298
    497440msgid "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. NOTE: This will require an extra (but easy) setup step."
    498441msgstr ""
    499442
    500 #: bp-core/admin/bp-core-admin.php:292 bp-core/admin/bp-core-update.php:316
     443#: bp-core/admin/bp-core-admin.php:304 bp-core/admin/bp-core-update.php:316
    501444msgid "Site Tracking"
    502445msgstr ""
    503446
    504 #: bp-core/admin/bp-core-admin.php:293 bp-core/admin/bp-core-update.php:325
     447#: bp-core/admin/bp-core-admin.php:305 bp-core/admin/bp-core-update.php:325
    505448msgid "Track new sites, new posts and new comments across your entire network."
    506449msgstr ""
    507450
    508 #: bp-core/admin/bp-core-admin.php:306
     451#: bp-core/admin/bp-core-admin.php:318
    509452msgid "Active Components"
    510453msgstr ""
    511454
    512 #: bp-core/admin/bp-core-admin.php:308
     455#: bp-core/admin/bp-core-admin.php:320
    513456msgid "Choose which BuddyPress components you would like to use."
    514457msgstr ""
    515458
    516 #: bp-core/admin/bp-core-admin.php:360
     459#: bp-core/admin/bp-core-admin.php:372
    517460#: bp-themes/bp-default/members/index.php:21
    518461msgid "Members Directory"
    519462msgstr ""
    520463
    521 #: bp-core/admin/bp-core-admin.php:361
     464#: bp-core/admin/bp-core-admin.php:373
    522465msgid "Activity Directory"
    523466msgstr ""
    524467
    525 #: bp-core/admin/bp-core-admin.php:362 bp-themes/bp-default/groups/index.php:21
     468#: bp-core/admin/bp-core-admin.php:374 bp-themes/bp-default/groups/index.php:21
    526469#: bp-themes/bp-default/groups/create.php:18
    527470msgid "Groups Directory"
    528471msgstr ""
    529472
    530 #: bp-core/admin/bp-core-admin.php:363 bp-themes/bp-default/forums/index.php:23
     473#: bp-core/admin/bp-core-admin.php:375 bp-themes/bp-default/forums/index.php:23
    531474msgid "Forums Directory"
    532475msgstr ""
    533476
    534 #: bp-core/admin/bp-core-admin.php:367 bp-core/admin/bp-core-update.php:210
     477#: bp-core/admin/bp-core-admin.php:379 bp-core/admin/bp-core-update.php:210
    535478#: bp-themes/bp-default/blogs/index.php:21
    536479#: bp-themes/bp-default/blogs/create.php:21
    537480msgid "Site Directory"
    538481msgstr ""
    539482
    540 #: bp-core/admin/bp-core-admin.php:369
     483#: bp-core/admin/bp-core-admin.php:381
    541484msgid "Directory Pages"
    542485msgstr ""
    543486
    544 #: bp-core/admin/bp-core-admin.php:371
     487#: bp-core/admin/bp-core-admin.php:383
    545488msgid "Choose a WordPress Page to associate with each BuddyPress component directory. Deactivated components should be set to \"None\"."
    546489msgstr ""
    547490
    548 #: bp-core/admin/bp-core-admin.php:388 bp-core/admin/bp-core-admin.php:428
     491#: bp-core/admin/bp-core-admin.php:400 bp-core/admin/bp-core-admin.php:440
    549492msgid "- None -"
    550493msgstr ""
    551494
    552 #: bp-core/admin/bp-core-admin.php:406
     495#: bp-core/admin/bp-core-admin.php:418
    553496msgid "Sign up Page"
    554497msgstr ""
    555498
    556 #: bp-core/admin/bp-core-admin.php:407
     499#: bp-core/admin/bp-core-admin.php:419
    557500msgid "Activation Page"
    558501msgstr ""
    559502
    560 #: bp-core/admin/bp-core-admin.php:410
     503#: bp-core/admin/bp-core-admin.php:422
    561504msgid "Other Pages"
    562505msgstr ""
    563506
    564 #: bp-core/admin/bp-core-admin.php:412
     507#: bp-core/admin/bp-core-admin.php:424
    565508msgid "Associate WordPress Pages with the following BuddyPress pages. Setting to \"None\" will render that page inaccessible."
    566509msgstr ""
    567510
    568511#: bp-core/admin/bp-core-update.php:69 bp-core/admin/bp-core-update.php:214
    569 #: bp-core/bp-core-functions.php:284
     512#: bp-core/bp-core-functions.php:285
    570513msgid "Components"
    571514msgstr ""
    572515
     
    685628msgstr ""
    686629
    687630#: bp-core/admin/bp-core-update.php:390
    688 #: bp-activity/bp-activity-template.php:1299
     631#: bp-activity/bp-activity-template.php:1296
    689632msgid "groups"
    690633msgstr ""
    691634
     
    733676#: bp-core/admin/bp-core-update.php:455 bp-core/bp-core-template.php:245
    734677#: bp-groups/bp-groups-activity.php:103 bp-groups/bp-groups-activity.php:116
    735678#: bp-groups/bp-groups-activity.php:129 bp-groups/bp-groups-activity.php:142
    736 #: bp-groups/bp-groups-loader.php:389 bp-groups/bp-groups-widgets.php:18
    737 #: bp-groups/bp-groups-widgets.php:39 bp-groups/bp-groups-widgets.php:106
    738 #: bp-groups/bp-groups-screens.php:821 bp-activity/bp-activity-loader.php:165
     679#: bp-groups/bp-groups-loader.php:265 bp-groups/bp-groups-loader.php:389
     680#: bp-groups/bp-groups-widgets.php:18 bp-groups/bp-groups-widgets.php:39
     681#: bp-groups/bp-groups-widgets.php:106 bp-groups/bp-groups-screens.php:821
     682#: bp-activity/bp-activity-loader.php:165
    739683#: bp-activity/bp-activity-loader.php:238
    740684msgid "Groups"
    741685msgstr ""
    742686
    743687#: bp-core/admin/bp-core-update.php:470 bp-core/bp-core-template.php:251
    744688#: bp-forums/bp-forums-admin.php:192 bp-forums/bp-forums-loader.php:111
    745 #: bp-forums/bp-forums-loader.php:194 bp-forums/bp-forums-loader.php:234
     689#: bp-forums/bp-forums-loader.php:194
    746690msgid "Forums"
    747691msgstr ""
    748692
    749 #: bp-core/admin/bp-core-update.php:498 bp-core/bp-core-functions.php:484
    750 #: bp-members/bp-members-adminbar.php:61
     693#: bp-core/admin/bp-core-update.php:498 bp-core/bp-core-functions.php:485
     694#: bp-members/bp-members-adminbar.php:90
    751695msgid "Register"
    752696msgstr ""
    753697
     
    755699msgid "Displays a site registration page where users can create new accounts."
    756700msgstr ""
    757701
    758 #: bp-core/admin/bp-core-update.php:509 bp-core/bp-core-functions.php:479
     702#: bp-core/admin/bp-core-update.php:509 bp-core/bp-core-functions.php:480
    759703#: bp-messages/bp-messages-template.php:493
    760704#: bp-themes/bp-default/registration/activate.php:36
    761705msgid "Activate"
     
    989933msgstr ""
    990934
    991935#: bp-core/bp-core-template.php:321 bp-core/bp-core-template.php:323
    992 #: bp-core/bp-core-buddybar.php:449 bp-members/bp-members-adminbar.php:169
     936#: bp-core/bp-core-buddybar.php:417 bp-members/bp-members-adminbar.php:195
    993937#: bp-members/bp-members-template.php:654 bp-themes/bp-default/sidebar.php:18
    994938msgid "Log Out"
    995939msgstr ""
    996940
    997 #: bp-core/bp-core-filters.php:54
     941#: bp-core/bp-core-filters.php:55
    998942msgid "noreply"
    999943msgstr ""
    1000944
    1001 #: bp-core/bp-core-filters.php:158 bp-core/bp-core-filters.php:182
     945#: bp-core/bp-core-filters.php:159 bp-core/bp-core-filters.php:183
    1002946msgid "[User Set]"
    1003947msgstr ""
    1004948
    1005 #: bp-core/bp-core-filters.php:203
     949#: bp-core/bp-core-filters.php:204
    1006950msgid "Activate %s"
    1007951msgstr ""
    1008952
    1009 #: bp-core/bp-core-filters.php:235 bp-members/bp-members-signup.php:571
     953#: bp-core/bp-core-filters.php:236 bp-members/bp-members-signup.php:571
    1010954msgid ""
    1011955"Thanks for registering! To complete the activation of your account please click the following link:\n"
    1012956"\n"
     
    1014958"\n"
    1015959msgstr ""
    1016960
    1017 #: bp-core/bp-core-filters.php:236 bp-members/bp-members-signup.php:572
     961#: bp-core/bp-core-filters.php:237 bp-members/bp-members-signup.php:572
    1018962msgid "Activate Your Account"
    1019963msgstr ""
    1020964
    1021965#. translators: "displayed user's name | canonicalised component name"
    1022966#. translators: "group name | group nav section name"
    1023967
    1024 #: bp-core/bp-core-filters.php:277 bp-core/bp-core-filters.php:283
     968#: bp-core/bp-core-filters.php:278 bp-core/bp-core-filters.php:284
    1025969msgid "%1$s | %2$s"
    1026970msgstr ""
    1027971
    1028972#. translators: "root component name | component item name | component nav
    1029973#. section name"
    1030974
    1031 #: bp-core/bp-core-filters.php:288
     975#: bp-core/bp-core-filters.php:289
    1032976msgid "%1$s | %2$s | %3$s"
    1033977msgstr ""
    1034978
    1035 #: bp-core/bp-core-filters.php:293 bp-core/bp-core-filters.php:295
     979#: bp-core/bp-core-filters.php:294 bp-core/bp-core-filters.php:296
    1036980msgid "%s Directory"
    1037981msgstr ""
    1038982
    1039 #: bp-core/bp-core-filters.php:299
     983#: bp-core/bp-core-filters.php:300
    1040984#: bp-themes/bp-default/registration/register.php:23
    1041985msgid "Create an Account"
    1042986msgstr ""
    1043987
    1044 #: bp-core/bp-core-filters.php:303
     988#: bp-core/bp-core-filters.php:304
    1045989#: bp-themes/bp-default/registration/activate.php:24
    1046990msgid "Activate your Account"
    1047991msgstr ""
    1048992
    1049 #: bp-core/bp-core-filters.php:307 bp-themes/bp-default/groups/index.php:21
     993#: bp-core/bp-core-filters.php:308 bp-themes/bp-default/groups/index.php:21
    1050994#: bp-themes/bp-default/groups/create.php:18
    1051995msgid "Create a Group"
    1052996msgstr ""
     
    10971041msgid "Yahoo Messenger"
    10981042msgstr ""
    10991043
    1100 #: bp-core/bp-core-functions.php:285 bp-settings/bp-settings-loader.php:17
     1044#: bp-core/bp-core-functions.php:286 bp-settings/bp-settings-loader.php:17
    11011045#: bp-settings/bp-settings-loader.php:73 bp-settings/bp-settings-loader.php:143
    1102 #: bp-groups/bp-groups-loader.php:188 bp-groups/bp-groups-template.php:1251
     1046#: bp-groups/bp-groups-loader.php:188
    11031047msgid "Settings"
    11041048msgstr ""
    11051049
    1106 #: bp-core/bp-core-functions.php:400
     1050#: bp-core/bp-core-functions.php:401
    11071051msgid "<strong>BuddyPress is almost ready</strong>. You must <a href=\"%s\">update your permalink structure</a> to something other than the default for it to work."
    11081052msgstr ""
    11091053
    1110 #: bp-core/bp-core-functions.php:413
     1054#: bp-core/bp-core-functions.php:414
    11111055msgid "You'll need to <a href='%s'>activate a <strong>BuddyPress-compatible theme</strong></a> to take advantage of all of BuddyPress's features. We've bundled a default theme, but you can always <a href='%s'>install some other compatible themes</a> or <a href='%s'>update your existing WordPress theme</a>."
    11121056msgstr ""
    11131057
    1114 #: bp-core/bp-core-functions.php:452
     1058#: bp-core/bp-core-functions.php:453
    11151059msgid "Some of your WordPress pages are linked to BuddyPress components that have been disabled. These pages may continue to show up in your site navigation. Consider <a href=\"%1$s\">reactivating the components</a>, or unpublishing the pages: <strong>%2$s</strong>"
    11161060msgstr ""
    11171061
    1118 #: bp-core/bp-core-functions.php:497
     1062#: bp-core/bp-core-functions.php:498
    11191063msgid "Some BuddyPress components must be associated with WordPress pages for your site to work properly. The following components are missing their required WP pages: <strong>%1$s</strong>. Visit the <a href=\"%2$s\">BuddyPress Components</a> panel, where you can either deactivate unused components or complete the page setup."
    11201064msgstr ""
    11211065
    1122 #: bp-core/bp-core-functions.php:651
     1066#: bp-core/bp-core-functions.php:652
    11231067msgid "year"
    11241068msgstr ""
    11251069
    1126 #: bp-core/bp-core-functions.php:651
     1070#: bp-core/bp-core-functions.php:652
    11271071msgid "years"
    11281072msgstr ""
    11291073
    1130 #: bp-core/bp-core-functions.php:652
     1074#: bp-core/bp-core-functions.php:653
    11311075msgid "month"
    11321076msgstr ""
    11331077
    1134 #: bp-core/bp-core-functions.php:652
     1078#: bp-core/bp-core-functions.php:653
    11351079msgid "months"
    11361080msgstr ""
    11371081
    1138 #: bp-core/bp-core-functions.php:653
     1082#: bp-core/bp-core-functions.php:654
    11391083msgid "week"
    11401084msgstr ""
    11411085
    1142 #: bp-core/bp-core-functions.php:653
     1086#: bp-core/bp-core-functions.php:654
    11431087msgid "weeks"
    11441088msgstr ""
    11451089
    1146 #: bp-core/bp-core-functions.php:654
     1090#: bp-core/bp-core-functions.php:655
    11471091msgid "day"
    11481092msgstr ""
    11491093
    1150 #: bp-core/bp-core-functions.php:654
     1094#: bp-core/bp-core-functions.php:655
    11511095msgid "days"
    11521096msgstr ""
    11531097
    1154 #: bp-core/bp-core-functions.php:655
     1098#: bp-core/bp-core-functions.php:656
    11551099msgid "hour"
    11561100msgstr ""
    11571101
    1158 #: bp-core/bp-core-functions.php:655
     1102#: bp-core/bp-core-functions.php:656
    11591103msgid "hours"
    11601104msgstr ""
    11611105
    1162 #: bp-core/bp-core-functions.php:656
     1106#: bp-core/bp-core-functions.php:657
    11631107msgid "minute"
    11641108msgstr ""
    11651109
    1166 #: bp-core/bp-core-functions.php:656
     1110#: bp-core/bp-core-functions.php:657
    11671111msgid "minutes"
    11681112msgstr ""
    11691113
    1170 #: bp-core/bp-core-functions.php:657
     1114#: bp-core/bp-core-functions.php:658
    11711115msgid "second"
    11721116msgstr ""
    11731117
    1174 #: bp-core/bp-core-functions.php:657 bp-core/bp-core-functions.php:698
    1175 #: bp-core/bp-core-functions.php:715
     1118#: bp-core/bp-core-functions.php:658 bp-core/bp-core-functions.php:699
     1119#: bp-core/bp-core-functions.php:716
    11761120msgid "seconds"
    11771121msgstr ""
    11781122
    1179 #: bp-core/bp-core-functions.php:678
     1123#: bp-core/bp-core-functions.php:679
    11801124msgid "sometime"
    11811125msgstr ""
    11821126
    1183 #: bp-core/bp-core-functions.php:710
     1127#: bp-core/bp-core-functions.php:711
    11841128msgctxt "Separator in time since"
    11851129msgid ","
    11861130msgstr ""
    11871131
    1188 #: bp-core/bp-core-functions.php:764
     1132#: bp-core/bp-core-functions.php:760
    11891133msgid "not recently active"
    11901134msgstr ""
    11911135
     
    11971141msgid "You must log in to access the page you requested."
    11981142msgstr ""
    11991143
    1200 #: bp-core/bp-core-buddybar.php:240
    1201 msgid "You do not have access to this page."
    1202 msgstr ""
    1203 
    1204 #: bp-core/bp-core-buddybar.php:391 bp-themes/bp-default/sidebar.php:50
     1144#: bp-core/bp-core-buddybar.php:359 bp-themes/bp-default/sidebar.php:50
    12051145msgid "Log In"
    12061146msgstr ""
    12071147
    1208 #: bp-core/bp-core-buddybar.php:395
     1148#: bp-core/bp-core-buddybar.php:363
    12091149msgid "Sign Up"
    12101150msgstr ""
    12111151
    1212 #: bp-core/bp-core-buddybar.php:407
     1152#: bp-core/bp-core-buddybar.php:375
    12131153msgid "My Account"
    12141154msgstr ""
    12151155
    1216 #: bp-core/bp-core-buddybar.php:478
     1156#: bp-core/bp-core-buddybar.php:446
    12171157msgid "Visit"
    12181158msgstr ""
    12191159
    1220 #: bp-core/bp-core-buddybar.php:480
     1160#: bp-core/bp-core-buddybar.php:448
    12211161msgid "Random Member"
    12221162msgstr ""
    12231163
    1224 #: bp-core/bp-core-buddybar.php:484
     1164#: bp-core/bp-core-buddybar.php:452
    12251165msgid "Random Group"
    12261166msgstr ""
    12271167
    1228 #: bp-core/bp-core-buddybar.php:490
     1168#: bp-core/bp-core-buddybar.php:458
    12291169msgid "Random Site"
    12301170msgstr ""
    12311171
     
    12521192msgstr ""
    12531193
    12541194#: bp-friends/bp-friends-loader.php:109 bp-friends/bp-friends-loader.php:169
    1255 #: bp-friends/bp-friends-loader.php:195
    1256 #: bp-themes/bp-default/members/single/activity.php:35
    1257 #: bp-themes/bp-default/activity/index.php:118
    1258 msgid "Friendships"
     1195#: bp-friends/bp-friends-loader.php:195 bp-friends/bp-friends-template.php:89
     1196msgid "My Friends"
    12591197msgstr ""
    12601198
    1261 #: bp-friends/bp-friends-loader.php:119 bp-groups/bp-groups-template.php:1256
     1199#: bp-friends/bp-friends-loader.php:119
    12621200msgid "Requests"
    12631201msgstr ""
    12641202
     
    13351273msgstr ""
    13361274
    13371275#: bp-friends/bp-friends-template.php:89
    1338 msgid "My Friends"
    1339 msgstr ""
    1340 
    1341 #: bp-friends/bp-friends-template.php:89
    13421276msgid "%s's Friends"
    13431277msgstr ""
    13441278
     
    14781412msgstr ""
    14791413
    14801414#: bp-settings/bp-settings-loader.php:108
    1481 #: bp-members/bp-members-adminbar.php:143
    14821415#: bp-themes/bp-default/members/single/settings/delete-account.php:50
    14831416msgid "Delete Account"
    14841417msgstr ""
     
    15471480msgid "There was an error leaving the group."
    15481481msgstr ""
    15491482
    1550 #: bp-groups/bp-groups-actions.php:248 bp-groups/bp-groups-functions.php:279
     1483#: bp-groups/bp-groups-actions.php:248 bp-groups/bp-groups-functions.php:265
    15511484msgid "You successfully left the group."
    15521485msgstr ""
    15531486
     
    16351568msgid "You do not have access to this group."
    16361569msgstr ""
    16371570
    1638 #: bp-groups/bp-groups-loader.php:184 bp-groups/bp-groups-template.php:1244
     1571#: bp-groups/bp-groups-loader.php:184
    16391572msgid "Details"
    16401573msgstr ""
    16411574
    1642 #: bp-groups/bp-groups-loader.php:192 bp-groups/bp-groups-template.php:1252
     1575#: bp-groups/bp-groups-loader.php:192
    16431576msgid "Avatar"
    16441577msgstr ""
    16451578
     
    16511584msgid "Groups <span>(%d)</span>"
    16521585msgstr ""
    16531586
    1654 #: bp-groups/bp-groups-loader.php:237 bp-groups/bp-groups-loader.php:265
    1655 #: bp-groups/bp-groups-loader.php:404 bp-groups/bp-groups-loader.php:431
    1656 msgid "Memberships"
     1587#: bp-groups/bp-groups-loader.php:237 bp-groups/bp-groups-loader.php:404
     1588#: bp-groups/bp-groups-loader.php:431
     1589msgid "My Groups"
    16571590msgstr ""
    16581591
    16591592#: bp-groups/bp-groups-loader.php:248
     
    17001633msgid "No Pending Invites"
    17011634msgstr ""
    17021635
    1703 #: bp-groups/bp-groups-loader.php:450 bp-groups/bp-groups-buddybar.php:21
     1636#: bp-groups/bp-groups-loader.php:450 bp-groups/bp-groups-adminbar.php:58
     1637#: bp-groups/bp-groups-buddybar.php:21 bp-groups/bp-groups-template.php:1252
    17041638#: bp-groups/bp-groups-template.php:2297
    17051639msgid "Group Avatar"
    17061640msgstr ""
     
    17091643msgid "Group Mod"
    17101644msgstr ""
    17111645
    1712 #: bp-groups/bp-groups-classes.php:708 bp-groups/bp-groups-functions.php:96
     1646#: bp-groups/bp-groups-classes.php:708 bp-groups/bp-groups-adminbar.php:34
     1647#: bp-groups/bp-groups-functions.php:82
    17131648msgid "Group Admin"
    17141649msgstr ""
    17151650
     
    18231758"---------------------\n"
    18241759msgstr ""
    18251760
    1826 #: bp-groups/bp-groups-adminbar.php:55 bp-groups/bp-groups-buddybar.php:17
     1761#: bp-groups/bp-groups-adminbar.php:42 bp-groups/bp-groups-buddybar.php:17
     1762#: bp-groups/bp-groups-template.php:1244
    18271763msgid "Edit Details"
    18281764msgstr ""
    18291765
    1830 #: bp-groups/bp-groups-adminbar.php:63
    1831 msgid "Edit Settings"
     1766#: bp-groups/bp-groups-adminbar.php:50 bp-groups/bp-groups-buddybar.php:19
     1767#: bp-groups/bp-groups-template.php:1251
     1768msgid "Group Settings"
    18321769msgstr ""
    18331770
    1834 #: bp-groups/bp-groups-adminbar.php:71 bp-members/bp-members-adminbar.php:116
    1835 msgid "Edit Avatar"
    1836 msgstr ""
    1837 
    1838 #: bp-groups/bp-groups-adminbar.php:80 bp-groups/bp-groups-buddybar.php:25
     1771#: bp-groups/bp-groups-adminbar.php:67 bp-groups/bp-groups-buddybar.php:25
    18391772msgid "Manage Invitations"
    18401773msgstr ""
    18411774
    1842 #: bp-groups/bp-groups-adminbar.php:89 bp-groups/bp-groups-buddybar.php:29
     1775#: bp-groups/bp-groups-adminbar.php:76 bp-groups/bp-groups-buddybar.php:29
     1776#: bp-groups/bp-groups-template.php:1253
    18431777msgid "Manage Members"
    18441778msgstr ""
    18451779
    1846 #: bp-groups/bp-groups-adminbar.php:98 bp-groups/bp-groups-buddybar.php:33
     1780#: bp-groups/bp-groups-adminbar.php:85 bp-groups/bp-groups-buddybar.php:33
     1781#: bp-groups/bp-groups-template.php:1256
    18471782msgid "Membership Requests"
    18481783msgstr ""
    18491784
    1850 #: bp-groups/bp-groups-adminbar.php:107 bp-groups/bp-groups-buddybar.php:37
    1851 #: bp-xprofile/bp-xprofile-admin.php:123
     1785#: bp-groups/bp-groups-adminbar.php:94 bp-groups/bp-groups-buddybar.php:37
     1786#: bp-groups/bp-groups-template.php:1261 bp-xprofile/bp-xprofile-admin.php:97
    18521787#: bp-themes/bp-default/groups/single/admin.php:358
    18531788msgid "Delete Group"
    18541789msgstr ""
     
    18931828msgid "Group invite accepted"
    18941829msgstr ""
    18951830
    1896 #: bp-groups/bp-groups-screens.php:59 bp-groups/bp-groups-functions.php:323
    1897 #: bp-groups/bp-groups-functions.php:800
     1831#: bp-groups/bp-groups-screens.php:59 bp-groups/bp-groups-functions.php:309
     1832#: bp-groups/bp-groups-functions.php:786
    18981833msgid "%1$s joined the group %2$s"
    18991834msgstr ""
    19001835
     
    21262061msgid "A member requests to join a private group for which you are an admin"
    21272062msgstr ""
    21282063
    2129 #: bp-groups/bp-groups-buddybar.php:14 bp-members/bp-members-buddybar.php:101
     2064#: bp-groups/bp-groups-buddybar.php:14 bp-xprofile/bp-xprofile-buddybar.php:47
     2065#: bp-members/bp-members-buddybar.php:101
    21302066msgid "Admin Options"
    21312067msgstr ""
    21322068
    2133 #: bp-groups/bp-groups-buddybar.php:19
    2134 msgid "Group Settings"
    2135 msgstr ""
    2136 
    21372069#: bp-groups/bp-groups-template.php:324
    21382070msgid "Public Group"
    21392071msgstr ""
     
    22462178msgid "This group has no moderators"
    22472179msgstr ""
    22482180
    2249 #: bp-groups/bp-groups-template.php:1261 bp-xprofile/bp-xprofile-admin.php:456
    2250 #: bp-forums/bp-forums-template.php:1070 bp-themes/bp-default/_inc/ajax.php:219
    2251 #: bp-themes/bp-default/members/single/messages/messages-loop.php:50
    2252 #: bp-themes/bp-default/members/single/messages/single.php:13
    2253 #: bp-themes/bp-default/activity/comment.php:32
    2254 #: bp-activity/bp-activity-template.php:1219
    2255 msgid "Delete"
    2256 msgstr ""
    2257 
    22582181#: bp-groups/bp-groups-template.php:1467 bp-groups/bp-groups-template.php:1468
    22592182#: bp-themes/bp-default/forums/index.php:23
    22602183#: bp-themes/bp-default/forums/single/forum.php:19
     
    23282251msgid "Group Activity RSS Feed"
    23292252msgstr ""
    23302253
    2331 #: bp-groups/bp-groups-functions.php:254
     2254#: bp-groups/bp-groups-functions.php:240
    23322255msgid "As the only Admin, you cannot leave the group."
    23332256msgstr ""
    23342257
    2335 #: bp-groups/bp-groups-functions.php:496
     2258#: bp-groups/bp-groups-functions.php:482
    23362259msgid "%1$s posted an update in the group %2$s:"
    23372260msgstr ""
    23382261
    23392262#: bp-xprofile/bp-xprofile-loader.php:137
    2340 #: bp-xprofile/bp-xprofile-loader.php:193 bp-xprofile/bp-xprofile-admin.php:455
    2341 #: bp-forums/bp-forums-template.php:1069 bp-themes/bp-default/functions.php:447
    2342 msgid "Edit"
     2263#: bp-xprofile/bp-xprofile-template.php:761
     2264#: bp-xprofile/bp-xprofile-template.php:762
     2265msgid "Edit Profile"
    23432266msgstr ""
    23442267
    23452268#: bp-xprofile/bp-xprofile-loader.php:147
    2346 #: bp-xprofile/bp-xprofile-loader.php:200
    23472269#: bp-themes/bp-default/members/single/profile/change-avatar.php:1
    23482270msgid "Change Avatar"
    23492271msgstr ""
    23502272
    23512273#: bp-xprofile/bp-xprofile-loader.php:186
    2352 #: bp-members/bp-members-template.php:523
    2353 #: bp-themes/bp-default/functions.php:443
    2354 #: bp-themes/bp-default/activity/entry.php:74
    2355 #: bp-activity/bp-activity-template.php:710
    2356 #: bp-activity/bp-activity-template.php:1239
    2357 msgid "View"
     2274msgid "View My Profile"
    23582275msgstr ""
    23592276
     2277#: bp-xprofile/bp-xprofile-loader.php:193
     2278msgid "Edit My Profile"
     2279msgstr ""
     2280
     2281#: bp-xprofile/bp-xprofile-loader.php:200
     2282msgid "Change My Avatar"
     2283msgstr ""
     2284
    23602285#: bp-xprofile/bp-xprofile-screens.php:85
    23612286msgid "Please make sure you fill in all required fields in this profile field group before saving."
    23622287msgstr ""
     
    25532478msgid "Checkbox field types require at least one option. Please add options below."
    25542479msgstr ""
    25552480
    2556 #: bp-xprofile/bp-xprofile-admin.php:23
    2557 msgid "Profiles Fields"
     2481#: bp-xprofile/bp-xprofile-buddybar.php:24
     2482msgid "Profile Fields"
    25582483msgstr ""
    25592484
    2560 #: bp-xprofile/bp-xprofile-admin.php:23
    2561 msgid "Profile Fields"
     2485#: bp-xprofile/bp-xprofile-buddybar.php:50
     2486#: bp-members/bp-members-adminbar.php:126
     2487#: bp-members/bp-members-buddybar.php:106
     2488msgid "Edit %s's Profile"
    25622489msgstr ""
    25632490
    2564 #: bp-xprofile/bp-xprofile-admin.php:72
     2491#: bp-xprofile/bp-xprofile-buddybar.php:51
     2492#: bp-members/bp-members-adminbar.php:134
     2493#: bp-members/bp-members-adminbar.php:142
     2494#: bp-members/bp-members-buddybar.php:110
     2495msgid "Edit %s's Avatar"
     2496msgstr ""
     2497
     2498#: bp-xprofile/bp-xprofile-buddybar.php:55
     2499msgid "Edit %s's Settings"
     2500msgstr ""
     2501
     2502#: bp-xprofile/bp-xprofile-buddybar.php:61
     2503#: bp-members/bp-members-adminbar.php:151
     2504#: bp-members/bp-members-buddybar.php:114
     2505msgid "Mark as Spammer"
     2506msgstr ""
     2507
     2508#: bp-xprofile/bp-xprofile-buddybar.php:65
     2509#: bp-members/bp-members-adminbar.php:159
     2510#: bp-members/bp-members-buddybar.php:118
     2511msgid "Not a Spammer"
     2512msgstr ""
     2513
     2514#: bp-xprofile/bp-xprofile-buddybar.php:69
     2515msgid "Delete %s"
     2516msgstr ""
     2517
     2518#: bp-xprofile/bp-xprofile-admin.php:46
    25652519msgid "Extended Profile Fields"
    25662520msgstr ""
    25672521
    2568 #: bp-xprofile/bp-xprofile-admin.php:74 bp-xprofile/bp-xprofile-admin.php:176
     2522#: bp-xprofile/bp-xprofile-admin.php:48 bp-xprofile/bp-xprofile-admin.php:150
    25692523msgid "Add New Group"
    25702524msgstr ""
    25712525
    2572 #: bp-xprofile/bp-xprofile-admin.php:77
     2526#: bp-xprofile/bp-xprofile-admin.php:51
    25732527msgid "Your users will distinguish themselves through their profile page. You must give them profile fields that allow them to describe themselves in a way that is relevant to the theme of your social network."
    25742528msgstr ""
    25752529
    2576 #: bp-xprofile/bp-xprofile-admin.php:78
     2530#: bp-xprofile/bp-xprofile-admin.php:52
    25772531msgid "NOTE: Any fields in the \"%s\" group will appear on the signup page."
    25782532msgstr ""
    25792533
    2580 #: bp-xprofile/bp-xprofile-admin.php:101 bp-xprofile/bp-xprofile-admin.php:391
     2534#: bp-xprofile/bp-xprofile-admin.php:75 bp-xprofile/bp-xprofile-admin.php:365
    25812535msgid "(Primary)"
    25822536msgstr ""
    25832537
    2584 #: bp-xprofile/bp-xprofile-admin.php:118
     2538#: bp-xprofile/bp-xprofile-admin.php:92
    25852539msgid "Add New Field"
    25862540msgstr ""
    25872541
    2588 #: bp-xprofile/bp-xprofile-admin.php:119
     2542#: bp-xprofile/bp-xprofile-admin.php:93
    25892543msgid "Edit Group"
    25902544msgstr ""
    25912545
    2592 #: bp-xprofile/bp-xprofile-admin.php:158
     2546#: bp-xprofile/bp-xprofile-admin.php:132
    25932547msgid "There are no fields in this group."
    25942548msgstr ""
    25952549
    2596 #: bp-xprofile/bp-xprofile-admin.php:175
     2550#: bp-xprofile/bp-xprofile-admin.php:149
    25972551msgid "You have no groups."
    25982552msgstr ""
    25992553
    2600 #: bp-xprofile/bp-xprofile-admin.php:207
     2554#: bp-xprofile/bp-xprofile-admin.php:181
    26012555msgid "There was an error saving the group. Please try again"
    26022556msgstr ""
    26032557
    2604 #: bp-xprofile/bp-xprofile-admin.php:210
     2558#: bp-xprofile/bp-xprofile-admin.php:184
    26052559msgid "The group was saved successfully."
    26062560msgstr ""
    26072561
    2608 #: bp-xprofile/bp-xprofile-admin.php:239
     2562#: bp-xprofile/bp-xprofile-admin.php:213
    26092563msgid "There was an error deleting the group. Please try again"
    26102564msgstr ""
    26112565
    2612 #: bp-xprofile/bp-xprofile-admin.php:242
     2566#: bp-xprofile/bp-xprofile-admin.php:216
    26132567msgid "The group was deleted successfully."
    26142568msgstr ""
    26152569
    2616 #: bp-xprofile/bp-xprofile-admin.php:283
     2570#: bp-xprofile/bp-xprofile-admin.php:257
    26172571msgid "There was an error saving the field. Please try again"
    26182572msgstr ""
    26192573
    2620 #: bp-xprofile/bp-xprofile-admin.php:289
     2574#: bp-xprofile/bp-xprofile-admin.php:263
    26212575msgid "The field was saved successfully."
    26222576msgstr ""
    26232577
    2624 #: bp-xprofile/bp-xprofile-admin.php:316
     2578#: bp-xprofile/bp-xprofile-admin.php:290
    26252579msgid "field"
    26262580msgstr ""
    26272581
    2628 #: bp-xprofile/bp-xprofile-admin.php:318
     2582#: bp-xprofile/bp-xprofile-admin.php:292
    26292583msgid "option"
    26302584msgstr ""
    26312585
    2632 #: bp-xprofile/bp-xprofile-admin.php:323
     2586#: bp-xprofile/bp-xprofile-admin.php:297
    26332587msgid "There was an error deleting the %s. Please try again"
    26342588msgstr ""
    26352589
    2636 #: bp-xprofile/bp-xprofile-admin.php:326
     2590#: bp-xprofile/bp-xprofile-admin.php:300
    26372591msgid "The %s was deleted successfully!"
    26382592msgstr ""
    26392593
    2640 #: bp-xprofile/bp-xprofile-admin.php:391
     2594#: bp-xprofile/bp-xprofile-admin.php:365
    26412595msgid "(Required)"
    26422596msgstr ""
    26432597
    2644 #: bp-xprofile/bp-xprofile-admin.php:424
     2598#: bp-xprofile/bp-xprofile-admin.php:398
    26452599#: bp-themes/bp-default/registration/register.php:119
    26462600#: bp-themes/bp-default/members/single/profile/edit.php:58
    26472601#: bp-themes/bp-default/members/single/profile/edit.php:73
    26482602msgid "Clear"
    26492603msgstr ""
    26502604
     2605#: bp-xprofile/bp-xprofile-admin.php:429 bp-forums/bp-forums-template.php:1069
     2606#: bp-themes/bp-default/functions.php:447
     2607msgid "Edit"
     2608msgstr ""
     2609
     2610#: bp-xprofile/bp-xprofile-admin.php:430 bp-forums/bp-forums-template.php:1070
     2611#: bp-themes/bp-default/_inc/ajax.php:219
     2612#: bp-themes/bp-default/members/single/messages/messages-loop.php:50
     2613#: bp-themes/bp-default/members/single/messages/single.php:13
     2614#: bp-themes/bp-default/activity/comment.php:32
     2615#: bp-activity/bp-activity-template.php:1219
     2616msgid "Delete"
     2617msgstr ""
     2618
    26512619#: bp-xprofile/bp-xprofile-template.php:558
    26522620msgid "January"
    26532621msgstr ""
     
    27082676msgid "Profile updated %s ago"
    27092677msgstr ""
    27102678
    2711 #: bp-xprofile/bp-xprofile-template.php:761
    2712 #: bp-xprofile/bp-xprofile-template.php:762
    2713 #: bp-members/bp-members-adminbar.php:108
    2714 msgid "Edit Profile"
    2715 msgstr ""
    2716 
    27172679#: bp-xprofile/bp-xprofile-activity.php:19
    27182680msgid "New member registered"
    27192681msgstr ""
     
    28042766msgid "Search Forums..."
    28052767msgstr ""
    28062768
    2807 #: bp-forums/bp-forums-loader.php:135 bp-forums/bp-forums-loader.php:201
    2808 msgid "Topics Started"
     2769#: bp-forums/bp-forums-loader.php:135
     2770msgid "Started"
    28092771msgstr ""
    28102772
    28112773#: bp-forums/bp-forums-loader.php:146
    28122774msgid "Replied To"
    28132775msgstr ""
    28142776
     2777#: bp-forums/bp-forums-loader.php:201
     2778msgid "My Topics"
     2779msgstr ""
     2780
    28152781#: bp-forums/bp-forums-loader.php:208
    2816 msgid "Replies"
     2782msgid "My Replies"
    28172783msgstr ""
    28182784
    2819 #: bp-forums/bp-forums-loader.php:215
    2820 msgid "Favorite Topics"
     2785#: bp-forums/bp-forums-loader.php:215 bp-themes/bp-default/functions.php:144
     2786msgid "My Favorites"
    28212787msgstr ""
    28222788
     2789#: bp-forums/bp-forums-loader.php:234
     2790msgid "My Forums"
     2791msgstr ""
     2792
    28232793#: bp-forums/bp-forums-template.php:371 bp-forums/bp-forums-template.php:430
    28242794#: bp-forums/bp-forums-template.php:1015
    28252795msgid "Deleted User"
     
    28982868msgstr ""
    28992869
    29002870#: bp-messages/bp-messages-loader.php:127
    2901 #: bp-messages/bp-messages-loader.php:206
    2902 msgid "Sent"
     2871msgid "Sent Messages"
    29032872msgstr ""
    29042873
    29052874#: bp-messages/bp-messages-loader.php:148
     
    29152884msgid "Messages"
    29162885msgstr ""
    29172886
     2887#: bp-messages/bp-messages-loader.php:206
     2888msgid "Sent"
     2889msgstr ""
     2890
    29182891#: bp-messages/bp-messages-loader.php:221
    29192892msgid "All Member Notices"
    29202893msgstr ""
     
    31003073msgid "You have %d new message"
    31013074msgstr ""
    31023075
    3103 #: bp-members/bp-members-adminbar.php:53
     3076#: bp-members/bp-members-adminbar.php:40
     3077msgid "Admin Dashboard"
     3078msgstr ""
     3079
     3080#: bp-members/bp-members-adminbar.php:50
     3081msgid "Network Dashboard"
     3082msgstr ""
     3083
     3084#: bp-members/bp-members-adminbar.php:82
    31043085msgid "Log in"
    31053086msgstr ""
    31063087
    3107 #: bp-members/bp-members-adminbar.php:125
    3108 #: bp-members/bp-members-buddybar.php:114
    3109 msgid "Mark as Spammer"
     3088#: bp-members/bp-members-adminbar.php:118
     3089msgid "User Admin"
    31103090msgstr ""
    31113091
    3112 #: bp-members/bp-members-adminbar.php:127
     3092#: bp-members/bp-members-adminbar.php:153
    31133093msgid "Are you sure you want to mark this user as a spammer?"
    31143094msgstr ""
    31153095
    3116 #: bp-members/bp-members-adminbar.php:133
    3117 #: bp-members/bp-members-buddybar.php:118
    3118 msgid "Not a Spammer"
     3096#: bp-members/bp-members-adminbar.php:161
     3097msgid "Are you sure you want to mark this user as not a spammer?"
    31193098msgstr ""
    31203099
    3121 #: bp-members/bp-members-adminbar.php:135
    3122 msgid "Are you sure you want to mark this user as not a spammer?"
     3100#: bp-members/bp-members-adminbar.php:169
     3101#: bp-members/bp-members-buddybar.php:122
     3102msgid "Delete %s's Account"
    31233103msgstr ""
    31243104
    3125 #: bp-members/bp-members-adminbar.php:145
     3105#: bp-members/bp-members-adminbar.php:171
    31263106msgid "Are you sure you want to delete this user's account?"
    31273107msgstr ""
    31283108
     
    31503130msgid "Blog Authors"
    31513131msgstr ""
    31523132
    3153 #: bp-members/bp-members-buddybar.php:106
    3154 msgid "Edit %s's Profile"
    3155 msgstr ""
    3156 
    3157 #: bp-members/bp-members-buddybar.php:110
    3158 msgid "Edit %s's Avatar"
    3159 msgstr ""
    3160 
    3161 #: bp-members/bp-members-buddybar.php:122
    3162 msgid "Delete %s's Account"
    3163 msgstr ""
    3164 
    31653133#: bp-members/bp-members-loader.php:70
    31663134msgid "Search Members..."
    31673135msgstr ""
     
    31703138msgid "You"
    31713139msgstr ""
    31723140
    3173 #: bp-members/bp-members-functions.php:669
     3141#: bp-members/bp-members-functions.php:610
    31743142msgid "<strong>ERROR</strong>: Your account has been marked as a spammer."
    31753143msgstr ""
    31763144
     
    32623230msgid "Never active"
    32633231msgstr ""
    32643232
     3233#: bp-members/bp-members-template.php:523
     3234#: bp-themes/bp-default/functions.php:443
     3235#: bp-themes/bp-default/activity/entry.php:74
     3236#: bp-activity/bp-activity-template.php:710
     3237#: bp-activity/bp-activity-template.php:1236
     3238msgid "View"
     3239msgstr ""
     3240
    32653241#: bp-members/bp-members-template.php:559
    32663242msgid "registered %s ago"
    32673243msgstr ""
     
    36073583msgid "Primary Navigation"
    36083584msgstr ""
    36093585
    3610 #: bp-themes/bp-default/functions.php:144
    3611 msgid "My Favorites"
    3612 msgstr ""
    3613 
    36143586#: bp-themes/bp-default/functions.php:145
    36153587msgid "Accepted"
    36163588msgstr ""
     
    36933665msgid "Your comment is awaiting moderation."
    36943666msgstr ""
    36953667
    3696 #: bp-themes/bp-default/functions.php:533
     3668#: bp-themes/bp-default/functions.php:525
    36973669msgid "Theme activated! This theme contains <a href=\"%s\">custom header image</a> support and <a href=\"%s\">sidebar widgets</a>."
    36983670msgstr ""
    36993671
     
    40243996msgid "Comments"
    40253997msgstr ""
    40263998
     3999#: bp-themes/bp-default/members/single/activity.php:35
     4000#: bp-themes/bp-default/activity/index.php:118
     4001msgid "Friendships"
     4002msgstr ""
     4003
    40274004#: bp-themes/bp-default/members/single/activity.php:43
    40284005#: bp-themes/bp-default/activity/index.php:104
    40294006#: bp-themes/bp-default/groups/single/activity.php:14
     
    40774054msgstr ""
    40784055
    40794056#: bp-themes/bp-default/activity/index.php:75
    4080 #: bp-activity/bp-activity-functions.php:128
     4057#: bp-activity/bp-activity-functions.php:114
    40814058msgid "@%s Mentions"
    40824059msgstr ""
    40834060
     
    45914568msgid "&nbsp; %s ago"
    45924569msgstr ""
    45934570
    4594 #: bp-activity/bp-activity-template.php:1299
     4571#: bp-activity/bp-activity-template.php:1296
    45954572msgid "xprofile"
    45964573msgstr ""
    45974574
    4598 #: bp-activity/bp-activity-template.php:1299
     4575#: bp-activity/bp-activity-template.php:1296
    45994576msgid "friends"
    46004577msgstr ""
    46014578
    4602 #: bp-activity/bp-activity-template.php:1299
     4579#: bp-activity/bp-activity-template.php:1296
    46034580msgid "status"
    46044581msgstr ""
    46054582
    4606 #: bp-activity/bp-activity-template.php:1299
     4583#: bp-activity/bp-activity-template.php:1296
    46074584msgid "sites"
    46084585msgstr ""
    46094586
    4610 #: bp-activity/bp-activity-template.php:1307
     4587#: bp-activity/bp-activity-template.php:1304
    46114588msgid "Clear Filter"
    46124589msgstr ""
    46134590
    4614 #: bp-activity/bp-activity-template.php:1373
     4591#: bp-activity/bp-activity-template.php:1370
    46154592msgid "a user"
    46164593msgstr ""
    46174594
    4618 #: bp-activity/bp-activity-template.php:1404
     4595#: bp-activity/bp-activity-template.php:1401
    46194596msgid "Mention this user in a new public message, this will send the user a notification to get their attention."
    46204597msgstr ""
    46214598
    4622 #: bp-activity/bp-activity-template.php:1405
     4599#: bp-activity/bp-activity-template.php:1402
    46234600msgid "Mention this User"
    46244601msgstr ""
    46254602
    4626 #: bp-activity/bp-activity-template.php:1533
     4603#: bp-activity/bp-activity-template.php:1530
    46274604msgid "Site Wide Activity RSS Feed"
    46284605msgstr ""
    46294606
     
    47074684msgid "[Read more]"
    47084685msgstr ""
    47094686
    4710 #: bp-activity/bp-activity-functions.php:131
     4687#: bp-activity/bp-activity-functions.php:117
    47114688msgid "You have %1$d new activity mentions"
    47124689msgstr ""
    47134690
    4714 #: bp-activity/bp-activity-functions.php:135
     4691#: bp-activity/bp-activity-functions.php:121
    47154692msgid "%1$s mentioned you in an activity update"
    47164693msgstr ""
    47174694
    4718 #: bp-activity/bp-activity-functions.php:537
     4695#: bp-activity/bp-activity-functions.php:523
    47194696msgid "Posted an update"
    47204697msgstr ""
    47214698
    4722 #: bp-activity/bp-activity-functions.php:679
     4699#: bp-activity/bp-activity-functions.php:662
    47234700msgid "%s posted an update:"
    47244701msgstr ""
    47254702
    4726 #: bp-activity/bp-activity-functions.php:731
     4703#: bp-activity/bp-activity-functions.php:715
    47274704msgid "%s posted a new activity comment:"
    47284705msgstr ""
    47294706
    4730 #: bp-activity/bp-activity-functions.php:968
    4731  No newline at end of file
     4707#: bp-activity/bp-activity-functions.php:952
     4708 No newline at end of file
    47324709msgid "Thumbnail"
    47334710msgstr ""
  • bp-loader.php

     
     
    2727
    2828// Define on which blog ID BuddyPress should run
    2929if ( !defined( 'BP_ROOT_BLOG' ) ) {
    30         if ( is_multisite() ) {
     30       
     31        // Root blog is the main site on this network
     32        if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
    3133                $current_site = get_current_site();
    3234                $root_blog_id = $current_site->blog_id;
    33         } else {
     35               
     36        // Root blog is every site on this network
     37        } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
     38                $root_blog_id = get_current_blog_id();
     39               
     40        // Root blog is the only blog on this network
     41        } elseif( !is_multisite() ) {
    3442                $root_blog_id = 1;
    3543        }
    3644
     
    103111
    104112        // Switch the user to the new bp-default if they are using the old
    105113        // bp-default on activation.
    106         if ( 'bp-sn-parent' == get_blog_option( BP_ROOT_BLOG, 'template' ) && 'bp-default' == get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) )
     114        if ( 'bp-sn-parent' == get_blog_option( bp_get_root_blog_id(), 'template' ) && 'bp-default' == get_blog_option( bp_get_root_blog_id(), 'stylesheet' ) )
    107115                switch_theme( 'bp-default', 'bp-default' );
    108116
    109117        do_action( 'bp_loader_activate' );
  • bp-members/bp-members-actions.php

     
    4848
    4949                foreach ( (array) $blogs as $key => $details ) {
    5050                        // Do not mark the main or current root blog as spam
    51                         if ( 1 == $details->userblog_id || BP_ROOT_BLOG == $details->userblog_id )
    52  No newline at end of file
     51                        if ( 1 == $details->userblog_id || bp_get_root_blog_id() == $details->userblog_id )
     52 No newline at end of file
    5353                                continue;
    5454
  • bp-members/bp-members-buddybar.php

     			// Update the blog status
     
    4848                return false;
    4949
    5050        // Hide on root blog
    51         if ( $wpdb->blogid == BP_ROOT_BLOG || !bp_is_active( 'blogs' ) )
     51        if ( $wpdb->blogid == bp_get_root_blog_id() || !bp_is_active( 'blogs' ) )
    5252                return false;
    5353
    5454        $blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid );
  • bp-messages/bp-messages-notifications.php

     
    2424
    2525                // Set up and send the message
    2626                $email_to      = $ud->user_email;
    27                 $sitename      = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    28  No newline at end of file
     27                $sitename      = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
     28 No newline at end of file
    2929                $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
    3030