Changeset 10460

Timestamp:

01/25/2016 01:49:30 AM (9 years ago)

Author:

dcavins

Message:

Allow bp_field_css_class() to accept multiple classes.

Allow bp_field_css_class() to accept more than one class
name passed as a space-separated string or array.

Fixes #6679.

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-template.php (modified) (2 diffs)
• tests/phpunit/testcases/xprofile/functions.php (modified) (1 diff)

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

@@ -444 +444 @@
  * Output the class attribute for a field.
  *
- * @param string|bool $class Extra classes to append to class attribute.
+ * @since 1.0.0
+ *
+ * @param array|string $class Extra classes to append to class attribute.
+ *                            Pass mutiple class names as an array or
+ *                            space-delimited string.
+ *
+ * @return string
  */
 function bp_field_css_class( $class = false ) {
@@ -462 +468 @@
 
         if ( ! empty( $class ) ) {
-            $css_classes[] = sanitize_title( esc_attr( $class ) );
+            if ( ! is_array( $class ) ) {
+                $class = preg_split( '#\s+#', $class );
+            }
+            $css_classes = array_map( 'sanitize_html_class', $class );
         }
 

trunk/tests/phpunit/testcases/xprofile/functions.php

@@ -940 +940 @@
         $this->assertFalse( bp_xprofile_is_richtext_enabled_for_field( $f ) );
     }
+
+    /**
+     * @group bp_get_field_css_class
+     */
+    public function test_bp_get_field_css_class_empty_param() {
+        // Fake the global
+        global $profile_template;
+        $reset_profile_template = $profile_template;
+
+        $profile_template = new stdClass;
+        // Avoid the 'alt' class being added
+        $profile_template->current_field = 2;
+        $profile_template->field = new stdClass;
+        $profile_template->field->id = 145;
+        $profile_template->field->name = 'Pie';
+        $profile_template->field->type = 'textbox';
+
+        $expected_classes = array(
+            'optional-field',
+            'field_' . $profile_template->field->id,
+            'field_' . sanitize_title( $profile_template->field->name ),
+            'field_type_' . sanitize_title( $profile_template->field->type ),
+            'visibility-public'
+            );
+
+        $classes = bp_get_field_css_class();
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $classes, $matches );
+        $ret_classes = explode( ' ', $matches[1] );
+        $this->assertEqualSets( $expected_classes, $ret_classes );
+
+        // Clean up!
+        $profile_template = $reset_profile_template;
+    }
+
+    /**
+     * @group bp_get_field_css_class
+     */
+    public function test_bp_get_field_css_class_space_delimited_string() {
+        // Fake the global
+        global $profile_template;
+        $reset_profile_template = $profile_template;
+
+        $profile_template = new stdClass;
+        // Avoid the 'alt' class being added
+        $profile_template->current_field = 2;
+        $profile_template->field = new stdClass;
+        $profile_template->field->id = 145;
+        $profile_template->field->name = 'Pie';
+        $profile_template->field->type = 'textbox';
+
+        $expected_classes = array(
+            'optional-field',
+            'field_' . $profile_template->field->id,
+            'field_' . sanitize_title( $profile_template->field->name ),
+            'field_type_' . sanitize_title( $profile_template->field->type ),
+            'visibility-public',
+            'rhubarb',
+            'apple'
+            );
+
+        $classes = bp_get_field_css_class( 'rhubarb apple' );
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $classes, $matches );
+        $ret_classes = explode( ' ', $matches[1] );
+        $this->assertEqualSets( $expected_classes, $ret_classes );
+
+        // Clean up!
+        $profile_template = $reset_profile_template;
+    }
+
+    /**
+     * @group bp_get_field_css_class
+     */
+    public function test_bp_get_field_css_class_array() {
+        // Fake the global
+        global $profile_template;
+        $reset_profile_template = $profile_template;
+
+        $profile_template = new stdClass;
+        // Avoid the 'alt' class being added
+        $profile_template->current_field = 2;
+        $profile_template->field = new stdClass;
+        $profile_template->field->id = 145;
+        $profile_template->field->name = 'Pie';
+        $profile_template->field->type = 'textbox';
+
+        $expected_classes = array(
+            'optional-field',
+            'field_' . $profile_template->field->id,
+            'field_' . sanitize_title( $profile_template->field->name ),
+            'field_type_' . sanitize_title( $profile_template->field->type ),
+            'visibility-public',
+            'blueberry',
+            'gooseberry'
+            );
+
+        $classes = bp_get_field_css_class( array( 'blueberry', 'gooseberry' ) );
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $classes, $matches );
+        $ret_classes = explode( ' ', $matches[1] );
+        $this->assertEqualSets( $expected_classes, $ret_classes );
+
+        // Clean up!
+        $profile_template = $reset_profile_template;
+    }
 }