Ticket #5589: ticket-5589.01.patch

bp-xprofile/bp-xprofile-classes.php

@@ -2497 +2497 @@
 }
 
 /**
+ * A placeholder xprofile field type. Doesn't do anything.
+ *
+ * Used if an existing field has an unknown type (e.g. one provided by a missing third-party plugin).
+ *
+ * @since BuddyPress (2.0.1)
+ */
+class BP_XProfile_Field_Type_Placeholder extends BP_XProfile_Field_Type {
+
+        /**
+         * Constructor for the placeholder field type.
+         *
+         * @since BuddyPress (2.0.1)
+         */
+        public function __construct() {
+        }
+
+        /**
+         * Prevent any HTML being ouptut for this field type.
+         *
+         * @param array $raw_properties Optional key/value array of {@link http://dev.w3.org/html5/markup/input.text.html permitted attributes} that you want to add.
+         * @since BuddyPress (2.0.1)
+         */
+        public function edit_field_html( array $raw_properties = array() ) {
+        }
+
+        /**
+         * Prevent any HTML being ouptut for this field type.
+         *
+         * @param array $raw_properties Optional key/value array of permitted attributes that you want to add.
+         * @since BuddyPress (2.0.1)
+         */
+        public function admin_field_html( array $raw_properties = array() ) {
+        }
+
+        /**
+         * Prevent any HTML being ouptut for this field type.
+         *
+         * @param BP_XProfile_Field $current_field The current profile field on the add/edit screen.
+         * @param string $control_type Optional. HTML input type used to render the current field's child options.
+         * @since BuddyPress (2.0.1)
+         */
+        public function admin_new_field_html( BP_XProfile_Field $current_field, $control_type = '' ) {}
+}
+
+/**
  * Represents a type of XProfile field and holds meta information about the type of value that it accepts.
  *
  * @since BuddyPress (2.0.0)

bp-xprofile/bp-xprofile-functions.php

@@ -95 +95 @@
         $class = isset( $field[$type] ) ? $field[$type] : '';
 
         /**
-         * For backpat and to handle (missing) field types introduced by other plugins, fallback to
-         * textbox if a type is unknown. Textbox validation and display is intentionally low key.
+         * To handle (missing) field types, fallback to a placeholder field object if a type is unknown.
          */
         if ( $class && class_exists( $class ) ) {
                 return new $class;
         } else {
-                return new BP_XProfile_Field_Type_Textbox;
+                return new BP_XProfile_Field_Type_Placeholder;
         }
 }
 

tests/testcases/xprofile/class-bp-xprofile-field-type.php

@@ -14 +14 @@
 
         public function test_unregistered_field_type_returns_textbox() {
                 $field = bp_xprofile_create_field_type( 'fakeyfield' );
-                $this->assertEquals( get_class( $field ), 'BP_XProfile_Field_Type_Textbox' );
+                $this->assertEquals( get_class( $field ), 'BP_XProfile_Field_Type_Placeholder' );
         }
 
         public function test_textbox_validate_empty_string() {