Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
07/04/2011 04:59:01 PM (13 years ago)
Author:
johnjamesjacoby
Message:
  • Swap BP_ROOT_BLOG const usage for new bp_get_root_blog_id() function
  • Use bp_get_root_blog_id() place of bp_get_option_blog_id()
  • Check for BP_ENABLE_MULTIBLOG when assigning root blog ID

See #3313, #3314.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/bp-core-catchuri.php

    r4584 r4602  
    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    }
     
    6767
    6868    // Running off blog other than root
    69     if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) ) {
     69    if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != bp_get_root_blog_id() ) ) {
    7070
    7171        // Any subdirectory names must be removed from $bp_uri.
Note: See TracChangeset for help on using the changeset viewer.