<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][9381] trunk: Allow multiple classes to be passed to the class argument of `bp_core_fetch_avatar()`</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9381">9381</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9381","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-19 23:41:33 +0000 (Mon, 19 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/6069">#6069</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreavatarsphp">trunk/tests/phpunit/testcases/core/avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-avatars.php 2015-01-19 21:07:23 UTC (rev 9380)
+++ trunk/src/bp-core/bp-core-avatars.php 2015-01-19 23:41:33 UTC (rev 9381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,8 +334,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create CSS class html string
</span><span class="cx" style="display: block; padding: 0 10px"> $params['class'] = apply_filters( 'bp_core_avatar_class', $params['class'], $params['item_id'], $params['object'], $params );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html_class = ' class="' . sanitize_html_class( $params['class'] ) . ' ' . sanitize_html_class( $params['object'] . '-' . $params['item_id'] . '-avatar' ) . ' ' . sanitize_html_class( 'avatar-' . $params['width'] ) . ' photo"';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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"';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set img URL and DIR based on prepopulated constants
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar_loc = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar_loc->path = trailingslashit( bp_core_avatar_upload_path() );
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/avatars.php 2015-01-19 21:07:23 UTC (rev 9380)
+++ trunk/tests/phpunit/testcases/core/avatars.php 2015-01-19 23:41:33 UTC (rev 9381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,4 +178,46 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $html, $expected_html );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @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 ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>