Changeset 4602 for trunk/bp-core/bp-core-filters.php

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:

• trunk/bp-core/bp-core-filters.php (modified) (3 diffs)

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

@@ -36 +36 @@
  */
 function bp_core_email_from_name_filter() {
-    return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES ) );
+    return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES ) );
 }
 add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
@@ -72 +72 @@
         return $themes;
 
-    if ( $wpdb->blogid == BP_ROOT_BLOG ) {
+    if ( $wpdb->blogid == bp_get_root_blog_id() ) {
         $themes['bp-default'] = 1;
     }
@@ -127 +127 @@
     global $bp, $wpdb;
 
-    if ( is_multisite() && $wpdb->blogid != BP_ROOT_BLOG )
+    if ( is_multisite() && $wpdb->blogid != bp_get_root_blog_id() )
         return $redirect_to;