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-avatars.php

    r4462 r4602  
    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
     
    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' );
     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' );
    673673    }
    674674
Note: See TracChangeset for help on using the changeset viewer.