Ticket #5184: 5184.patch

bp-xprofile/bp-xprofile-admin.php

@@ -247 +247 @@
                         $field->is_required = wp_filter_kses( $_POST['required'] );
                         $field->type        = wp_filter_kses( $_POST['fieldtype'] );
 
+                        $field->placeholder = wp_filter_kses( $_POST["placeholder_text_{$field->type}"] );
+
                         if ( !empty( $_POST["sort_order_{$field->type}"] ) )
                                 $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
 
@@ -283 +285 @@
                                         bp_xprofile_update_field_meta( $field_id, 'allow_custom_visibility', $_POST['allow-custom-visibility'] );
                                 }
 
+                                bp_xprofile_update_field_meta( $field_id, 'placeholder', $_POST["placeholder_text_{$field->type}"] );
+
                                 unset( $_GET['mode'] );
 
                                 do_action( 'xprofile_fields_saved_field', $field );

bp-xprofile/bp-xprofile-classes.php

@@ -478 +478 @@
                                 $this->data          = $this->get_field_data( $user_id );
                         }
 
+                        $this->placeholder = bp_xprofile_get_meta( $id, 'field', 'placeholder' );
+
                         $this->default_visibility = bp_xprofile_get_meta( $id, 'field', 'default_visibility' );
 
                         if ( empty( $this->default_visibility ) ) {
@@ -519 +521 @@
                 $this->order_by    = apply_filters( 'xprofile_field_order_by_before_save',    $this->order_by,    $this->id );
                 $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
                 $this->can_delete  = apply_filters( 'xprofile_field_can_delete_before_save',  $this->can_delete,  $this->id );
+                $this->placeholder = apply_filters( 'xprofile_field_placeholder_before_save', $this->placeholder, $this->id );
 
                 do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
 
@@ -617 +620 @@
                                 }
                         }
 
+                        bp_xprofile_update_field_meta( $field_id, 'placeholder', $field->placeholder);
+
                         do_action_ref_array( 'xprofile_field_after_save', array( $this ) );
 
                         return $field_id;
@@ -748 +753 @@
                                 $this->default_visibility = 'public';
                         }
 
+                        $placeholder = ! empty( $this->placeholder ) ? $this->placeholder : __( '----', 'buddypress' );
+
                         ?>
 
                         <div id="<?php echo esc_attr( $type ); ?>" class="postbox bp-options-box" style="<?php echo esc_attr( $class ); ?> margin-top: 15px;">
                                 <h3><?php _e( 'Please enter options for this Field:', 'buddypress' ); ?></h3>
                                 <div class="inside">
                                         <p>
+                                                <label for="placeholder_text_<?php echo esc_attr( $type ); ?>"><?php _e( 'Placeholder text:', 'buddypress' ); ?></label>
+                                                <input type="text" name="placeholder_text_<?php echo esc_attr( $type ); ?>" id="placeholder_text_<?php echo esc_attr( $type ); ?>" value="<?php echo esc_attr( $placeholder ) ?>" />
+                                        </p>
+                                        <p>
                                                 <label for="sort_order_<?php echo esc_attr( $type ); ?>"><?php _e( 'Sort Order:', 'buddypress' ); ?></label>
                                                 <select name="sort_order_<?php echo esc_attr( $type ); ?>" id="sort_order_<?php echo esc_attr( $type ); ?>" >
                                                         <option value="custom" <?php selected( 'custom', $this->order_by ); ?>><?php _e( 'Custom',     'buddypress' ); ?></option>
@@ -828 +839 @@
                                 $this->description = $_POST['description'];
                                 $this->is_required = $_POST['required'];
                                 $this->type        = $_POST['fieldtype'];
+                                $this->placeholder = $_POST["placeholder_{$this->type}"];
                                 $this->order_by    = $_POST["sort_order_{$this->type}"];
                                 $this->field_order = $_POST['field_order'];
                         }

bp-xprofile/bp-xprofile-template.php

@@ -420 +420 @@
 function bp_the_profile_field_options( $args = '' ) {
         echo bp_get_the_profile_field_options( $args );
 }
+
+function bp_get_placeholder_text_for_field( $field ) {
+    if ($field->placeholder) {
+                return $field->placeholder;
+    } else {
+                return /* translators: no option picked in select box */ __( '----', 'buddypress' ) ;
+    }
+}
+
         /**
          * bp_get_the_profile_field_options()
          *
@@ -468 +477 @@
                 switch ( $field->type ) {
                         case 'selectbox':
 
-                                $html .= '<option value="">' . /* translators: no option picked in select box */ __( '----', 'buddypress' ) . '</option>';
+                                $html .= '<option value="">' . esc_html( bp_get_placeholder_text_for_field($field) ) . '</option>';
 
                                 $original_option_values = '';
                                 $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );