<!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][5500] trunk/bp-groups: Pass concatenated alt parameter to bp_core_fetch_avatar() throughout groups component.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5500">5500</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-12-11 16:00:37 +0000 (Sun, 11 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass concatenated alt parameter to bp_core_fetch_avatar() throughout groups component. References <a href="http://buddypress.trac.wordpress.org/ticket/3806">#3806</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsadminbarphp">trunk/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-adminbar.php (5499 => 5500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-adminbar.php 2011-12-11 00:31:05 UTC (rev 5499)
+++ trunk/bp-groups/bp-groups-adminbar.php 2011-12-11 16:00:37 UTC (rev 5500)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> 'avatar_dir' => 'group-avatars',
</span><span class="cx"> 'item_id' => $bp->groups->current_group->id,
</span><span class="cx"> 'width' => 16,
</span><del>- 'height' => 16
</del><ins>+ 'height' => 16,
+ 'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $bp->groups->current_group->name )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Unique ID for the 'My Account' menu
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5499 => 5500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2011-12-11 00:31:05 UTC (rev 5499)
+++ trunk/bp-groups/bp-groups-loader.php 2011-12-11 16:00:37 UTC (rev 5500)
</span><span class="lines">@@ -469,7 +469,8 @@
</span><span class="cx">
</span><span class="cx"> $bp->bp_options_avatar = bp_core_fetch_avatar( array(
</span><span class="cx"> 'item_id' => bp_displayed_user_id(),
</span><del>- 'type' => 'thumb'
</del><ins>+ 'type' => 'thumb',
+ 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
</ins><span class="cx"> ) );
</span><span class="cx"> $bp->bp_options_title = $bp->displayed_user->fullname;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5499 => 5500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-12-11 00:31:05 UTC (rev 5499)
+++ trunk/bp-groups/bp-groups-template.php 2011-12-11 16:00:37 UTC (rev 5500)
</span><span class="lines">@@ -386,14 +386,14 @@
</span><span class="cx"> 'height' => false,
</span><span class="cx"> 'class' => 'avatar',
</span><span class="cx"> 'id' => false,
</span><del>- 'alt' => __( 'Group logo of %s', 'buddypress' )
</del><ins>+ 'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $groups_template->group->name )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> /* Fetch the avatar from the folder, if not provide backwards compat. */
</span><del>- if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $groups_template->group->name ) ) )
</del><ins>+ if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $alt ) ) )
</ins><span class="cx"> $avatar = '<img src="' . esc_attr( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_group_avatar', $avatar );
</span><span class="lines">@@ -565,11 +565,11 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- if ( $group->admins ) { ?>
</del><ins>+ if ( !empty( $group->admins ) ) { ?>
</ins><span class="cx"> <ul id="group-admins">
</span><span class="cx"> <?php foreach( (array)$group->admins as $admin ) { ?>
</span><span class="cx"> <li>
</span><del>- <a href="<?php echo bp_core_get_user_domain( $admin->user_id, $admin->user_nicename, $admin->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'email' => $admin->user_email, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?></a>
</del><ins>+ <a href="<?php echo bp_core_get_user_domain( $admin->user_id, $admin->user_nicename, $admin->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'email' => $admin->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?></a>
</ins><span class="cx"> </li>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </ul>
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> <?php foreach( (array)$group->mods as $mod ) { ?>
</span><span class="cx">
</span><span class="cx"> <li>
</span><del>- <a href="<?php echo bp_core_get_user_domain( $mod->user_id, $mod->user_nicename, $mod->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'email' => $mod->user_email, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?></a>
</del><ins>+ <a href="<?php echo bp_core_get_user_domain( $mod->user_id, $mod->user_nicename, $mod->user_login ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'email' => $mod->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?></a>
</ins><span class="cx"> </li>
</span><span class="cx">
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx">
</span><span class="cx"> <li>
</span><span class="cx">
</span><del>- <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
</del><ins>+ <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?>
</ins><span class="cx">
</span><span class="cx"> <h5>
</span><span class="cx">
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx">
</span><span class="cx"> <li>
</span><span class="cx">
</span><del>- <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
</del><ins>+ <?php echo bp_core_fetch_avatar( array( 'item_id' => $admin->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $admin->user_id ) ) ) ) ?>
</ins><span class="cx">
</span><span class="cx"> <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
</span><span class="cx"> <span class="activity">
</span><span class="lines">@@ -1094,7 +1094,7 @@
</span><span class="cx">
</span><span class="cx"> <li>
</span><span class="cx">
</span><del>- <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
</del><ins>+ <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?>
</ins><span class="cx">
</span><span class="cx"> <h5>
</span><span class="cx"> <?php echo bp_core_get_userlink( $mod->user_id ); ?>
</span><span class="lines">@@ -1110,7 +1110,7 @@
</span><span class="cx">
</span><span class="cx"> <li>
</span><span class="cx">
</span><del>- <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
</del><ins>+ <?php echo bp_core_fetch_avatar( array( 'item_id' => $mod->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $mod->user_id ) ) ) ) ?>
</ins><span class="cx">
</span><span class="cx"> <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>
</span><span class="cx">
</span><span class="lines">@@ -1789,7 +1789,7 @@
</span><span class="cx"> function bp_get_group_member_avatar() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'full', 'email' => $members_template->member->user_email, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'full', 'email' => $members_template->member->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->display_name ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_avatar_thumb() {
</span><span class="lines">@@ -1798,7 +1798,7 @@
</span><span class="cx"> function bp_get_group_member_avatar_thumb() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'email' => $members_template->member->user_email, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'email' => $members_template->member->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->display_name ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_avatar_mini( $width = 30, $height = 30 ) {
</span><span class="lines">@@ -1807,7 +1807,7 @@
</span><span class="cx"> function bp_get_group_member_avatar_mini( $width = 30, $height = 30 ) {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar_mini', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar_mini', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->display_name ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_name() {
</span><span class="lines">@@ -2513,7 +2513,7 @@
</span><span class="cx"> function bp_group_request_user_avatar_thumb() {
</span><span class="cx"> global $requests_template;
</span><span class="cx">
</span><del>- echo apply_filters( 'bp_group_request_user_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $requests_template->request->user_id, 'type' => 'thumb', 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) );
</del><ins>+ echo apply_filters( 'bp_group_request_user_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $requests_template->request->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $requests_template->request->user_id ) ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_request_reject_link() {
</span></span></pre>
</div>
</div>
</body>
</html>