Changeset 4634

Timestamp:

07/09/2011 10:13:15 PM (14 years ago)

Author:

boonebgorges

Message:

Introduces bp_xprofile_fullname_field_name() to avoid referencing BP_XPROFILE_FULLNAME_FIELD_NAME throughout BuddyPress. See #3314

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-friends/bp-friends-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-functions.php (modified) (3 diffs)

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

@@ -144 +144 @@
         global $bp;
 
+        $full_name_field_name = bp_xprofile_fullname_field_name();
+
         if ( bp_is_active( 'xprofile' ) )
             $this->profile_data = $this->get_profile_data();
@@ -149 +151 @@
         if ( $this->profile_data ) {
             $this->user_url  = bp_core_get_user_domain( $this->id, $this->profile_data['user_nicename'], $this->profile_data['user_login'] );
-            $this->fullname  = esc_attr( $this->profile_data[BP_XPROFILE_FULLNAME_FIELD_NAME]['field_data'] );
+            $this->fullname  = esc_attr( $this->profile_data[$full_name_field_name]['field_data'] );
             $this->user_link = "<a href='{$this->user_url}' title='{$this->fullname}'>{$this->fullname}</a>";
             $this->email     = esc_attr( $this->profile_data['user_email'] );
@@ -380 +382 @@
         $exclude_sql = ( !empty( $exclude ) ) ? " AND u.ID NOT IN ({$exclude})" : "";
 
-        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM {$wpdb->users} u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
-        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM {$wpdb->users} u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
+        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM {$wpdb->users} u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", bp_xprofile_fullname_field_name() ), $letter );
+        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM {$wpdb->users} u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", bp_xprofile_fullname_field_name() ), $letter, $pag_sql );
 
         $total_users = $wpdb->get_var( $total_users_sql );
@@ -507 +509 @@
         // Fetch the user's full name
         if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
-            $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
+            $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", bp_xprofile_fullname_field_name() ) );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
                 foreach ( (array)$names as $name ) {

trunk/bp-friends/bp-friends-classes.php

@@ -272 +272 @@
             return false;
 
-        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} pd, {$bp->profile->table_name_fields} pf WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} ) ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
+        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} pd, {$bp->profile->table_name_fields} pf WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} ) ORDER BY pd.value ASC", bp_xprofile_fullname_field_name() ) );
     }
 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -984 +984 @@
             $user_id = $bp->displayed_user->id;
 
-        $data = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
-
-        return $data[BP_XPROFILE_FULLNAME_FIELD_NAME];
+        $field_name = bp_xprofile_fullname_field_name();
+
+        $data = xprofile_get_field_data( $field_name, $user_id );
+
+        return $data[$field_name];
     }
 }

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -386 +386 @@
         return false;
 
-    $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
+    $fullname = xprofile_get_field_data( bp_xprofile_fullname_field_name(), $user_id );
     $space    = strpos( $fullname, ' ' );
 
@@ -419 +419 @@
         return;
 
-    xprofile_set_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user->ID, $user->display_name );
+    xprofile_set_field_data( bp_xprofile_fullname_field_name(), $user->ID, $user->display_name );
 }
 add_action( 'user_profile_update_errors', 'xprofile_sync_bp_profile', 10, 3 );
@@ -579 +579 @@
     return bp_xprofile_update_meta( $field_data_id, 'data', $meta_key, $meta_value );
 }
+
+/**
+ * Return the field name for the Full Name xprofile field
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @return str The field name
+ */
+function bp_xprofile_fullname_field_name() {
+    return apply_filters( 'bp_xprofile_fullname_field_name', BP_XPROFILE_FULLNAME_FIELD_NAME );
+}
+
 ?>