Skip to:
Content

BuddyPress.org

Changeset 3358


Ignore:
Timestamp:
11/05/2010 09:44:38 PM (16 years ago)
Author:
djpaul
Message:

Deprecated bp_core_is_multisite()

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-blogs.php

    r3337 r3358  
    44
    55/* Include the sitewide blog posts widget if this is a multisite installation */
    6 if ( bp_core_is_multisite() )
     6if ( is_multisite() )
    77    require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
    88
    … …  
    4444    /* Blog/post/comment menus should not appear on single WordPress setups. Although comments
    4545       and posts made by users will still show on their activity stream .*/
    46     if ( !bp_core_is_multisite() )
     46    if ( !is_multisite() )
    4747        return false;
    4848
    … …  
    7272    global $bp;
    7373
    74     if ( bp_core_is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
     74    if ( is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
    7575        $bp->is_directory = true;
    7676
    … …  
    9393    global $bp;
    9494
    95     if ( !bp_core_is_multisite() )
     95    if ( !is_multisite() )
    9696        return false;
    9797
    … …  
    103103    global $bp;
    104104
    105     if ( !bp_core_is_multisite() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
     105    if ( !is_multisite() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
    106106        return false;
    107107
    … …  
    358358
    359359    if ( 'publish' == $post->post_status && '' == $post->post_password ) {
    360         if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
     360        if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !is_multisite() ) {
    361361            /* Record this in activity streams */
    362362            $post_permalink = get_permalink( $post_id );
    … …  
    616616    global $wpdb, $bp;
    617617
    618     if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
     618    if ( !is_numeric( $blog_id ) || !is_multisite() )
    619619        return false;
    620620
    … …  
    644644    $blog_id = (int) $blog_id;
    645645
    646     if ( !$blog_id || !bp_core_is_multisite() )
     646    if ( !$blog_id || !is_multisite() )
    647647        return false;
    648648
    … …  
    676676    global $wpdb, $bp;
    677677
    678     if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
     678    if ( !is_numeric( $blog_id ) || !is_multisite() )
    679679        return false;
    680680
    … …  
    706706
    707707function bp_blogs_remove_data( $user_id ) {
    708     if ( !bp_core_is_multisite() )
     708    if ( !is_multisite() )
    709709        return false;
    710710

  • trunk/bp-core.php

    r3357 r3358  
    430430
    431431        /* Get the functions file */
    432         if ( bp_core_is_multisite() )
     432        if ( is_multisite() )
    433433            require_once( ABSPATH . 'wp-admin/includes/ms.php' );
    434434
    … …  
    454454
    455455        /* Finally, mark this user as a spammer */
    456         if ( bp_core_is_multisite() )
     456        if ( is_multisite() )
    457457            $wpdb->update( $wpdb->users, array( 'spam' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
    458458
    … …  
    12361236    global $wpdb;
    12371237
    1238     if ( bp_core_is_multisite() )
     1238    if ( is_multisite() )
    12391239        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
    12401240    else
    … …  
    15291529    global $bp, $current_site;
    15301530
    1531     if ( bp_core_is_multisite() )
     1531    if ( is_multisite() )
    15321532        $site_path = $current_site->path;
    15331533    else {
    … …  
    15871587    $meta_keys = "'" . implode( "','", (array)$options ) ."'";
    15881588
    1589     if ( bp_core_is_multisite() )
     1589    if ( is_multisite() )
    15901590        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
    15911591    else
    … …  
    16941694
    16951695    /* Specifically handle multi-site environment */
    1696     if ( bp_core_is_multisite() ) {
     1696    if ( is_multisite() ) {
    16971697        if ( $wp_version >= '3.0' )
    16981698            require_once( ABSPATH . '/wp-admin/includes/ms.php' );
    … …  
    18861886    $user = get_userdatabylogin( $username );
    18871887
    1888     if ( ( bp_core_is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
     1888    if ( ( is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
    18891889        bp_core_redirect( $bp->root_domain );
    18901890    else

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

    r3355 r3358  
    199199                </tr>
    200200                <?php endif; ?>
    201                 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && bp_core_is_multisite() ) : ?>
     201                <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && is_multisite() ) : ?>
    202202                <tr>
    203203                    <td><h3><?php _e( 'Blog Tracking', 'buddypress' ) ?></h3><p><?php _e( 'Tracks blogs, blog posts and blogs comments for a user across a WPMU installation.', 'buddypress' ) ?></p></td>

  • trunk/bp-core/admin/bp-core-upgrade.php

    r3355 r3358  
    237237
    238238
    239             <?php if ( bp_core_is_multisite() ) : ?>
     239            <?php if ( is_multisite() ) : ?>
    240240            <div class="component">
    241241                <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
    … …  
    414414            <?php endif; ?>
    415415
    416             <?php if ( bp_core_is_multisite() && !isset( $disabled_components['bp-blogs.php'] ) ) : ?>
     416            <?php if ( is_multisite() && !isset( $disabled_components['bp-blogs.php'] ) ) : ?>
    417417            <tr valign="top">
    418418                <th scope="row">
    … …  
    914914
    915915    /* Only install blog tables if this is a multisite installation */
    916     if ( bp_core_is_multisite() && empty( $disabled['bp-blogs.php'] ) )
     916    if ( is_multisite() && empty( $disabled['bp-blogs.php'] ) )
    917917        bp_core_install_blog_tracking();
    918918}
    … …  
    939939
    940940    // On first installation - record all existing blogs in the system.
    941     if ( !(int)$bp->site_options['bp-blogs-first-install'] && bp_core_is_multisite() ) {
     941    if ( !(int)$bp->site_options['bp-blogs-first-install'] && is_multisite() ) {
    942942        bp_blogs_record_existing_blogs();
    943943        add_site_option( 'bp-blogs-first-install', 1 );
    944944    }
    945945
    946     if ( bp_core_is_multisite() )
     946    if ( is_multisite() )
    947947        bp_core_add_illegal_names();
    948948

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

    r3300 r3358  
    228228            <?php endif; ?>
    229229
    230             <?php if ( bp_is_active( 'blogs' ) && bp_core_is_multisite() ) : ?>
     230            <?php if ( bp_is_active( 'blogs' ) && is_multisite() ) : ?>
    231231            <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
    232232
    … …  
    243243add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
    244244
    245 if ( bp_core_is_multisite() )
     245if ( is_multisite() )
    246246    add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
    247247
    248248add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
    249249
    250 if ( bp_core_is_multisite() )
     250if ( is_multisite() )
    251251    add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
    252252

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

    r3357 r3358  
    545545
    546546    // If multisite, and current blog does not match root blog, make adjustments
    547     if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
     547    if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
    548548        $upload_dir['basedir'] = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
    549549
    … …  
    567567
    568568    // If multisite, and current blog does not match root blog, make adjustments
    569     if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
     569    if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
    570570        $upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
    571571

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

    r3357 r3358  
    3737        $bp_pages = bp_core_get_page_names();
    3838
    39     if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && bp_core_is_multisite() ) {
     39    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
    4040        /* Only catch URI's on the root blog if we are not running BP on multiple blogs */
    4141        if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )

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

    r3300 r3358  
    1515        return false;
    1616
    17     if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
     17    if ( ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
    1818        $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
    1919
    … …  
    5050    global $current_blog;
    5151
    52     if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
     52    if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
    5353        return false;
    5454?>

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

    r3300 r3358  
    124124    global $bp, $current_blog;
    125125
    126     if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
     126    if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
    127127        return $redirect_to;
    128128

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

    r3356 r3358  
    139139
    140140                /* Finally, sign up the user and/or blog */
    141                 if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multisite() )
     141                if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
    142142                    bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
    143143                else {
    … …  
    163163        $bp->signup->step = 'completed-confirmation';
    164164
    165         if ( bp_core_is_multisite() ) {
     165        if ( is_multisite() ) {
    166166            /* Get the activation key */
    167167            if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
    … …  
    225225
    226226        /* Check for an uploaded avatar and move that to the correct user folder */
    227         if ( bp_core_is_multisite() )
     227        if ( is_multisite() )
    228228            $hashed_key = wp_hash( $_GET['key'] );
    229229        else
    … …  
    369369
    370370function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
    371     if ( !bp_core_is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
     371    if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
    372372        return false;
    373373
    … …  
    379379
    380380    /* Multisite installs have their own install procedure */
    381     if ( bp_core_is_multisite() ) {
     381    if ( is_multisite() ) {
    382382        wpmu_signup_user( $user_login, $user_email, $usermeta );
    383383
    … …  
    423423     */
    424424    if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
    425         if ( !bp_core_is_multisite() ) {
     425        if ( !is_multisite() ) {
    426426            $activation_key = wp_hash( $user_id );
    427427            update_user_meta( $user_id, 'activation_key', $activation_key );
    … …  
    436436
    437437function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
    438     if ( !bp_core_is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
     438    if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
    439439        return false;
    440440
    … …  
    448448
    449449    /* Multisite installs have their own activation routine */
    450     if ( bp_core_is_multisite() ) {
     450    if ( is_multisite() ) {
    451451        $user = wpmu_activate_signup( $key );
    452452
    … …  
    498498
    499499    /* Set the password on multisite installs */
    500     if ( bp_core_is_multisite() && !empty( $user['meta']['password'] ) )
     500    if ( is_multisite() && !empty( $user['meta']['password'] ) )
    501501        $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
    502502
    … …  
    618618        bp_core_redirect( bp_get_root_domain() . '/' . BP_REGISTER_SLUG . '/' );
    619619}
    620 if ( bp_core_is_multisite() )
     620if ( is_multisite() )
    621621    add_action( 'wp', 'bp_core_wpsignup_redirect' );
    622622else

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

    r3357 r3358  
    979979 * @global array $bp
    980980 * @uses function_exists
    981  * @uses bp_core_is_multisite()
     981 * @uses is_multisite()
    982982 * @return bool Filterable result
    983983 */
    … …  
    987987    if ( function_exists( 'xprofile_install' )
    988988         || function_exists( 'groups_install' )
    989          || ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() )
     989         || ( function_exists( 'bp_blogs_install' ) && is_multisite() )
    990990         || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
    991991        ) {
    … …  
    10251025        $options['forums'] = __( 'Forums', 'buddypress' );
    10261026
    1027     if ( bp_is_active( 'blogs' ) && bp_core_is_multisite() )
     1027    if ( bp_is_active( 'blogs' ) && is_multisite() )
    10281028        $options['blogs'] = __( 'Blogs', 'buddypress' );
    10291029
    … …  
    12431243        global $bp;
    12441244
    1245         if ( bp_core_is_multisite() ) {
     1245        if ( is_multisite() ) {
    12461246            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
    12471247                return true;
    … …  
    12591259        global $bp;
    12601260
    1261         if ( !bp_core_is_multisite() )
     1261        if ( !is_multisite() )
    12621262            return false;
    12631263

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

    r3300 r3358  
    1010 */
    1111
    12 if ( !bp_core_is_multisite() ) {
     12if ( !is_multisite() ) {
    1313    $wpdb->base_prefix = $wpdb->prefix;
    1414    $wpdb->blogid = 1;
    1515}
    1616
     17/**
     18 * bp_core_is_multisite()
     19 *
     20 * This function originally served as a wrapper when WordPress and WordPress MU were separate entities.
     21 * Use is_multisite() instead.
     22 *
     23 * @deprecated 1.3
     24 * @deprecated Use is_multisite()
     25 */
    1726function bp_core_is_multisite() {
     27    _deprecated_function( __FUNCTION__, '1.3', 'is_multisite()' );
    1828    if ( function_exists( 'is_multisite' ) )
    1929        return is_multisite();
    … …  
    3949    global $current_site, $current_blog;
    4050
    41     if ( !bp_core_is_multisite() )
     51    if ( !is_multisite() )
    4252        return true;
    4353
    … …  
    4959
    5060function bp_core_get_status_sql( $prefix = false ) {
    51     if ( !bp_core_is_multisite() )
     61    if ( !is_multisite() )
    5262        return "{$prefix}user_status = 0";
    5363    else

  • trunk/bp-forums/bp-forums-admin.php

    r3300 r3358  
    159159    $file .= "\n" .   '$bb->name = \'' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
    160160
    161     if ( bp_core_is_multisite() )
     161    if ( is_multisite() )
    162162        $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
    163163
Note: See TracChangeset for help on using the changeset viewer.