Changeset 7599

Timestamp:

11/24/2013 04:01:11 PM (11 years ago)

Author:

djpaul

Message:

XProfile: Show the placeholder text for all select box profile fields.

Prior to BP 1.5, the "----" placeholder item for select boxes was shown for both optional and mandatory fields. In BP 1.5 in r4831, the behaviour was changed to only show the placeholder item for optional profile fields. With retrospect, that change didn’t make much sense.

This commits restores the original behaviour, showing the placeholder text for all select box profile fields. A user should be forced to pick an option for a required profile field, and not allow the web browser to automatically select the first option in the <select> element.

See #3378, #3698, and #5184. Props haykayltduk, hnla, DJPaul at WordCamp London contributor day!

File:

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

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

@@ -438 +438 @@
         global $field;
 
-        // Generally a required dropdown field will not get a blank value at
-        // the top. Set 'null_on_required' to true if you want this blank value
-        // even on required fields.
         $defaults = array(
-            'type'             => false,
-            'null_on_required' => false
+            'type' => false,
         );
 
@@ -473 +469 @@
             case 'selectbox':
 
-                if ( !$field->is_required || $null_on_required ) {
-                    $html .= '<option value="">' . /* translators: no option picked in select box */ __( '----', 'buddypress' ) . '</option>';
-                }
+                $html .= '<option value="">' . /* translators: no option picked in select box */ __( '----', 'buddypress' ) . '</option>';
 
                 $original_option_values = '';