Changeset 3917 for trunk/bp-core/bp-core-classes.php

Timestamp:

01/25/2011 08:58:56 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

File:

• trunk/bp-core/bp-core-classes.php (modified) (4 diffs)

trunk/bp-core/bp-core-classes.php

@@ -56 +56 @@
      */
     function populate() {
-        if ( bp_is_active( 'profile' ) )
+        if ( bp_is_active( 'xprofile' ) )
             $this->profile_data = $this->get_profile_data();
 
@@ -124 +124 @@
         $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
 
-        if ( $search_terms && bp_is_active( 'profile' ) || 'alphabetical' == $type )
+        if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
             $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
 
@@ -167 +167 @@
         }
 
-        if ( $search_terms && bp_is_active( 'profile' ) ) {
+        if ( $search_terms && bp_is_active( 'xprofile' ) ) {
             $search_terms             = like_escape( $wpdb->escape( $search_terms ) );
             $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
@@ -349 +349 @@
 
         // Fetch the user's full name
-        if ( bp_is_active( 'profile' ) && 'alphabetical' != $type ) {
+        if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
             // Ensure xprofile globals are set
             if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )