Changeset 9381

Timestamp:

01/19/2015 11:41:33 PM (10 years ago)

Author:

imath

Message:

Allow multiple classes to be passed to the class argument of bp_core_fetch_avatar()

Using an array of classes or a list of classes separated by a space for the class argument of bp_core_fetch_avatar() will output each one of them into the class attribute of the image tag.

Fixes #6069

Location:

trunk

Files:

• src/bp-core/bp-core-avatars.php (modified) (1 diff)
• tests/phpunit/testcases/core/avatars.php (modified) (1 diff)

trunk/src/bp-core/bp-core-avatars.php

@@ -335 +335 @@
     // Create CSS class html string
     $params['class'] = apply_filters( 'bp_core_avatar_class', $params['class'], $params['item_id'], $params['object'], $params );
-    $html_class = ' class="' . sanitize_html_class( $params['class'] ) . ' ' . sanitize_html_class( $params['object'] . '-' . $params['item_id'] . '-avatar' ) . ' ' . sanitize_html_class( 'avatar-' . $params['width'] ) . ' photo"';
+
+    // Use an alias to leave the param unchanged
+    $avatar_classes = $params['class'];
+    if ( ! is_array( $avatar_classes ) ) {
+        $avatar_classes = explode( ' ', $avatar_classes );
+    }
+
+    // merge classes
+    $avatar_classes = array_merge( $avatar_classes, array(
+        $params['object'] . '-' . $params['item_id'] . '-avatar',
+        'avatar-' . $params['width'],
+    ) );
+
+    // Sanitize each class
+    $avatar_classes = array_map( 'sanitize_html_class', $avatar_classes );
+
+    // populate the class attribute
+    $html_class = ' class="' . join( ' ', $avatar_classes ) . ' photo"';
 
     // Set img URL and DIR based on prepopulated constants

trunk/tests/phpunit/testcases/core/avatars.php

@@ -179 +179 @@
         $this->assertEquals( $html, $expected_html );
     }
+
+    /**
+     * @group bp_core_fetch_avatar
+     */
+    public function test_bp_core_fetch_avatar_class_attribute() {
+        $u = $this->factory->user->create();
+
+        $hw = 100;
+        $args = array(
+            'item_id'    => $u,
+            'object'     => 'user',
+            'type'       => 'full',
+            'width'      => $hw,
+            'height'     => $hw,
+            'class'      => '',
+            'no_grav'    => true,
+            'html'       => true,
+        );
+
+        // Class attribute is empty
+        $avatar = bp_core_fetch_avatar( $args );
+        $expected = array( 'avatar', 'user-' . $u . '-avatar', 'avatar-' . $hw );
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $avatar, $matches );
+        $classes = explode( ' ', $matches[1] );
+        $this->assertSame( $expected, array_intersect_key( $expected, $classes ) );
+
+        // Class attribute is a String
+        $args['class'] = 'custom-class class-custom';
+        $avatar = bp_core_fetch_avatar( $args );
+        $expected = array_merge( explode( ' ', $args['class'] ), array( 'user-' . $u . '-avatar', 'avatar-' . $hw ) );
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $avatar, $matches );
+        $classes = explode( ' ', $matches[1] );
+        $this->assertSame( $expected, array_intersect_key( $expected, $classes ) );
+
+        // Class attribute is an Array
+        $args['class'] = array( 'custom-class', 'class-custom' );
+        $avatar = bp_core_fetch_avatar( $args );
+        $expected = array_merge( $args['class'], array( 'user-' . $u . '-avatar', 'avatar-' . $hw ) );
+        preg_match( '/class=["\']?([^"\']*)["\' ]/is', $avatar, $matches );
+        $classes = explode( ' ', $matches[1] );
+        $this->assertSame( $expected, array_intersect_key( $expected, $classes ) );
+    }
 }