Changeset 8810

Timestamp:

08/12/2014 01:15:20 PM (10 years ago)

Author:

johnjamesjacoby

Message:

In bp-xprofile-functions.php use bp_disable_profile_sync() where appropriate, ensuring filters are applied in realtime.

File:

• trunk/src/bp-xprofile/bp-xprofile-functions.php (modified) (2 diffs)

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

@@ -709 +709 @@
 function xprofile_sync_wp_profile( $user_id = 0 ) {
 
-    $bp = buddypress();
-
-    if ( !empty( $bp->site_options['bp-disable-profile-sync'] ) && (int) $bp->site_options['bp-disable-profile-sync'] )
+    // Bail if profile syncing is disabled
+    if ( bp_disable_profile_sync() ) {
         return true;
-
-    if ( empty( $user_id ) )
+    }
+
+    if ( empty( $user_id ) ) {
         $user_id = bp_loggedin_user_id();
-
-    if ( empty( $user_id ) )
-        return false;
+    }
+
+    if ( empty( $user_id ) ) {
+        return false;
+    }
 
     $fullname = xprofile_get_field_data( bp_xprofile_fullname_field_id(), $user_id );
@@ -751 +753 @@
  */
 function xprofile_sync_bp_profile( &$errors, $update, &$user ) {
-    global $bp;
-
-    if ( ( !empty( $bp->site_options['bp-disable-profile-sync'] ) && (int) $bp->site_options['bp-disable-profile-sync'] ) || !$update || $errors->get_error_codes() )
+
+    // Bail if profile syncing is disabled
+    if ( bp_disable_profile_sync() ) {
         return;
+    }
 
     xprofile_set_field_data( bp_xprofile_fullname_field_id(), $user->ID, $user->display_name );