Changeset 8554

Timestamp:

06/28/2014 06:23:15 PM (9 years ago)

Author:

djpaul

Message:

xProfile: fix profile fields not rendering if their value is "0".

This was caused by a reliance on the empty() function in a few places, which was causing us to
not handle "0" (both as int and string) as a valid field value. In turn, this was causing the
profile field template loop to skip rendering the affected field.

Fixes #5731, props DJPaul and r-a-y.

Location:

trunk/src/bp-xprofile

Files:

• bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile-template.php (modified) (1 diff)

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

@@ -228 +228 @@
                     // Empty fields may contain a serialized empty array
                     $maybe_value = maybe_unserialize( $data->value );
-                    if ( !empty( $maybe_value ) && false !== $key = array_search( $data->field_id, $field_ids ) ) {
+
+                    // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731
+                    if ( ( ! empty( $maybe_value ) || '0' == $maybe_value ) && false !== $key = array_search( $data->field_id, $field_ids ) ) {
+
                         // Fields that have data get removed from the list
                         unset( $field_ids[$key] );

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

@@ -128 +128 @@
  */
 function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
-    if ( !isset( $field_value ) || empty( $field_value ) )
+    // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731
+    if ( ! isset( $field_value ) || empty( $field_value ) && '0' != $field_value )
         return false;
 

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

@@ -143 +143 @@
         $field = $this->next_field();
 
-        $value = !empty( $field->data ) && !empty( $field->data->value ) ? maybe_unserialize( $field->data->value ) : false;
-
-        if ( !empty( $value ) ) {
+        // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731
+        if ( ! empty( $field->data ) && ( ! empty( $field->data->value ) || '0' == $field->data->value ) ) {
+            $value = maybe_unserialize( $field->data->value );
+        } else {
+            $value = false;
+        }
+
+        if ( ! empty( $value ) || '0' == $value ) {
             $this->field_has_data = true;
         } else {