<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3035] branches/1.2/bp-core/bp-core-avatars.php: Fixes #2288,
#2183, and #2426.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3035</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-10 22:09:38 +0000 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2288, #2183, and #2426.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoreavatarsphp">branches/1.2/bp-core/bp-core-avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-avatars.php (3034 => 3035)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-avatars.php 2010-06-10 20:36:08 UTC (rev 3034)
+++ branches/1.2/bp-core/bp-core-avatars.php 2010-06-10 22:09:38 UTC (rev 3035)
</span><span class="lines">@@ -410,22 +410,42 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Override internal "get_avatar()" function to use our own where possible
</del><ins>+/**
+ * bp_core_fetch_avatar_filter()
+ *
+ * Attempts to filter get_avatar function and let BuddyPress have a go
+ * at finding an avatar that may have been uploaded locally.
+ *
+ * @global array $authordata
+ * @param string $avatar The result of get_avatar from before-filter
+ * @param int|string|object $user A user ID, email address, or comment object
+ * @param int $size Size of the avatar image (thumb/full)
+ * @param string $default URL to a default image to use if no avatar is available
+ * @param string $alt Alternate text to use in image tag. Defaults to blank
+ * @return <type>
+ */
</ins><span class="cx"> function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
</span><del>- global $authordata;
</del><span class="cx">
</span><ins>+ // If passed an object, assume $user->user_id
</ins><span class="cx"> if ( is_object( $user ) )
</span><span class="cx"> $id = $user->user_id;
</span><ins>+
+ // If passed a number, assume it was a $user_id
</ins><span class="cx"> else if ( is_numeric( $user ) )
</span><span class="cx"> $id = $user;
</span><del>- else
- $id = $authordata->ID;
</del><span class="cx">
</span><ins>+ // If passed a string and that string returns a user, get the $id
+ else if ( is_string( $user ) && ( $user_by_email = get_user_by_email( $user ) ) )
+ $id = $user_by_email->ID;
+
+ // If somehow $id hasn't been assigned, return the result of get_avatar
</ins><span class="cx"> if ( empty( $id ) )
</span><del>- return $avatar;
</del><ins>+ return !empty( $avatar ) ? $avatar : $default;
</ins><span class="cx">
</span><ins>+ // Let BuddyPress handle the fetching of the avatar
</ins><span class="cx"> $bp_avatar = bp_core_fetch_avatar( array( 'item_id' => $id, 'width' => $size, 'height' => $size, 'alt' => $alt ) );
</span><span class="cx">
</span><ins>+ // If BuddyPress found an avatar, use it. If not, use the result of get_avatar
</ins><span class="cx"> return ( !$bp_avatar ) ? $avatar : $bp_avatar;
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'get_avatar', 'bp_core_fetch_avatar_filter', 10, 5 );
</span></span></pre>
</div>
</div>
</body>
</html>