Ticket #5630: 5630.03.patch

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

@@ -1693 +1693 @@
          * @since BuddyPress (2.0.0)
          */
         public function admin_new_field_html( BP_XProfile_Field $current_field, $control_type = '' ) {}
+
+        /**
+         * Apply formatting specific to a Date field.
+         *
+         * @param string $field_value The date value, as saved in the database.
+         *        Typically, this is a MySQL-formatted date string (Y-m-d H:i:s).
+         * @return string
+         */
+        public static function display_filter( $field_value ) {
+                // If Unix timestamp
+                if ( is_numeric( $field_value ) ) {
+                        $field_value = bp_format_time( $field_value, true, false );
+
+                // If MySQL timestamp
+                } else {
+                        $field_value = bp_format_time( strtotime( $field_value ), true, false );
+                }
+
+                return $field_value;
+        }
 }
 
 /**
@@ -2849 +2869 @@
                 <?php
         }
 
+        /**
+         * Allow field types to modify the appearance of their values.
+         *
+         * By default, this is a pass-through method that does nothing. Only
+         * override in your own field type if you need to provide custom
+         * filtering for output values.
+         *
+         * @since BuddyPress (2.1.0)
+         *
+         * @param mixed $field_value Field value.
+         * @return mixed
+         */
+        public static function display_filter( $field_value ) {
+                return $field_value;
+        }
 
         /**
          * Internal protected/private helper methods past this point.

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

@@ -49 +49 @@
 
 add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value', 1, 2 );
 add_filter( 'bp_get_the_site_member_profile_data',      'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'xprofile_get_field_data',                  'xprofile_filter_format_field_value_by_field_id', 5, 2 );
+add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value_by_type', 5, 2 );
 add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_link_profile_data',  9, 2 );
 
 add_filter( 'xprofile_data_value_before_save',          'xprofile_sanitize_data_value_before_save', 1, 2 );
@@ -134 +136 @@
         if ( !isset( $field_value ) || empty( $field_value ) )
                 return false;
 
-        if ( 'datebox' == $field_type ) {
+        if ( 'datebox' != $field_type ) {
+                $field_value = str_replace(']]>', ']]>', $field_value );
+        }
 
-                // If Unix timestamp
-                if ( is_numeric( $field_value ) ) {
-                        $field_value = bp_format_time( $field_value, true, false );
+        return stripslashes( $field_value );
+}
 
-                // If MySQL timestamp
-                } else {
-                        $field_value = bp_format_time( strtotime( $field_value ), true, false );
+/**
+ * Apply display_filter() filters as defined by the BP_XProfile_Field_Type classes, when fetched inside a bp_has_profile() loop.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param mixed $field_value Field value.
+ * @param string $field_type Field type.
+ * @return mixed
+ */
+function xprofile_filter_format_field_value_by_type( $field_value, $field_type = '' ) {
+        foreach ( bp_xprofile_get_field_types() as $type => $class ) {
+                if ( $type !== $field_type ) {
+                        continue;
                 }
 
-        } else {
-                $field_value = str_replace(']]>', ']]>', $field_value );
+                if ( method_exists( array( $class, 'display_filter' ) ) ) {
+                        $field_value = call_user_func( array( $class, 'display_filter' ), $field_value );
+                }
         }
 
-        return stripslashes( $field_value );
+        return $field_value;
+}
+
+/**
+ * Apply display_filter() filters as defined by the BP_XProfile_Field_Type classes, when fetched by xprofile_get_field_data().
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param mixed $field_value
+ * @param int $field_id
+ */
+function xprofile_filter_format_field_value_by_field_id( $field_value, $field_id ) {
+        $field = new BP_XProfile_Field( $field_id );
+        return xprofile_filter_format_field_value_by_type( $field_value, $field->type );
 }
 
 function xprofile_filter_link_profile_data( $field_value, $field_type = 'textbox' ) {