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

Timestamp:

02/11/2012 03:21:00 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Replace direct references to $bp user fullname and user_login with their functional equivalents, and kill off some $bp global usage in the process. See #3994, #3989.

File:

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

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

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -55 +56 @@
  */
 function bp_core_allow_default_theme( $themes ) {
-    global $bp, $wpdb;
+    global $wpdb;
 
     if ( !bp_current_user_can( 'bp_moderate' ) )
@@ -141 +142 @@
  */
 function bp_core_filter_user_welcome_email( $welcome_email ) {
-    /* Don't touch the email if we don't have a custom registration template */
+
+    // Don't touch the email if we don't have a custom registration template
     if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
         return $welcome_email;
@@ -165 +167 @@
  */
 function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
-    /* Don't touch the email if we don't have a custom registration template */
+
+    // Don't touch the email if we don't have a custom registration template
     if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
         return $welcome_email;
@@ -265 +268 @@
 
     // Displayed user
-    if ( !empty( $bp->displayed_user->fullname ) && !is_404() ) {
+    if ( bp_get_displayed_user_fullname() && !is_404() ) {
 
         // Get the component's ID to try and get it's name