Changeset 9687

Timestamp:

04/03/2015 04:59:44 PM (10 years ago)

Author:

johnjamesjacoby

Message:

XProfile: General code formatting cleanup to bp-xprofile-template.php. See #6347.

File:

• trunk/src/bp-xprofile/bp-xprofile-template.php (modified) (14 diffs)

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

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
+/**
+ * The main profile template loop class.
+ *
+ * This is responsible for loading profile field, group, and data and displaying it.
+ *
+ * @since BuddyPress (1.0.0)
+ */
 class BP_XProfile_Data_Template {
 
@@ -378 +385 @@
         $css_classes = array();
 
-        if ( $class )
+        if ( empty( $class ) ) {
             $css_classes[] = sanitize_title( esc_attr( $class ) );
+        }
 
         // Set a class with the field ID
@@ -397 +405 @@
         $css_classes[] = 'visibility-' . esc_attr( bp_get_the_profile_field_visibility_level() );
 
-        if ( $profile_template->current_field % 2 == 1 )
+        if ( $profile_template->current_field % 2 == 1 ) {
             $css_classes[] = 'alt';
+        }
 
         $css_classes[] = 'field_type_' . sanitize_title( $profile_template->field->type );
@@ -429 +438 @@
     global $profile_template;
 
-    if ( $profile_template->field_has_data )
+    if ( ! empty( $profile_template->field_has_data ) ) {
         return true;
+    }
 
     return false;
@@ -644 +654 @@
          * value as long as it's not empty and a required field.
          */
-        if ( !isset( $field->data ) ) {
+        if ( ! isset( $field->data ) ) {
             $field->data = new stdClass;
         }
 
-        if ( !isset( $field->data->value ) ) {
+        if ( ! isset( $field->data->value ) ) {
             $field->data->value = '';
         }
 
         if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {
-            if ( !empty( $_POST['field_' . $field->id] ) )
+            if ( ! empty( $_POST['field_' . $field->id] ) ) {
                 $field->data->value = $_POST['field_' . $field->id];
-            else
+            } else {
                 $field->data->value = '';
+            }
         }
 
@@ -789 +800 @@
 
             foreach ( $field as $field_prop => $field_prop_value ) {
-                if ( ! isset( $field_obj->{$field_prop} ) )
+                if ( ! isset( $field_obj->{$field_prop} ) ) {
                     $field_obj->{$field_prop} = $field_prop_value;
+                }
             }
 
@@ -814 +826 @@
 
         // Super admins can skip required check
-        if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() )
+        if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() ) {
             $retval = false;
 
         // All other users will use the field's setting
-        elseif ( isset( $field->is_required ) )
+        } elseif ( isset( $field->is_required ) ) {
             $retval = $field->is_required;
+        }
 
         /**
@@ -892 +905 @@
          * @param string $retval Field visibility level label.
          */
-        return apply_filters( 'bp_get_the_profile_field_visibility_level_label', $fields[$level]['label'] );
+        return apply_filters( 'bp_get_the_profile_field_visibility_level_label', $fields[ $level ]['label'] );
     }
 
@@ -911 +924 @@
     function bp_get_profile_field_data( $args = '' ) {
 
-        $defaults = array(
+        $r = wp_parse_args( $args, array(
             'field'   => false, // Field name or ID.
             'user_id' => bp_displayed_user_id()
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
+        ) );
 
         /**
@@ -926 +936 @@
          * @param mixed $value Profile data for a specific field for the user.
          */
-        return apply_filters( 'bp_get_profile_field_data', xprofile_get_field_data( $field, $user_id ) );
+        return apply_filters( 'bp_get_profile_field_data', xprofile_get_field_data( $r['field'], $r['user_id'] ) );
     }
 
@@ -1079 +1089 @@
     $last_updated = bp_get_profile_last_updated();
 
-    if ( !$last_updated ) {
+    if ( empty( $last_updated ) ) {
         _e( 'Profile not recently updated', 'buddypress' ) . '.';
     } else {
@@ -1089 +1099 @@
         $last_updated = bp_get_user_meta( bp_displayed_user_id(), 'profile_last_updated', true );
 
-        if ( $last_updated ) {
+        if ( ! empty( $last_updated ) ) {
 
             /**
@@ -1108 +1118 @@
 }
     function bp_get_current_profile_group_id() {
-        if ( !$profile_group_id = bp_action_variable( 1 ) )
+        $profile_group_id = bp_action_variable( 1 );
+        if ( empty( $profile_group_id ) ) {
             $profile_group_id = 1;
+        }
 
         /**
@@ -1142 +1154 @@
     $bp = buddypress();
 
-    bp_button( array (
+    bp_button( array(
         'id'                => 'edit_profile',
         'component'         => 'xprofile',