<!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] [3081] branches/1.2/bp-core/bp-core-avatars.php:
Fixes #2470 props r-a-y</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3081</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-27 03:20:23 +0000 (Sun, 27 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2470 props r-a-y</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 (3080 => 3081)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-avatars.php 2010-06-27 03:12:46 UTC (rev 3080)
+++ branches/1.2/bp-core/bp-core-avatars.php 2010-06-27 03:20:23 UTC (rev 3081)
</span><span class="lines">@@ -170,19 +170,28 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* If no avatars have been uploaded for this item, display a gravatar */
</del><ins>+ // If no avatars could be found, try to display a gravatar
+
+ // Skips gravatar check if $no_grav is passed
</ins><span class="cx"> if ( !$no_grav ) {
</span><ins>+
+ // Set gravatar size
+ if ( $width )
+ $grav_size = $width;
+ else if ( 'full' == $type )
+ $grav_size = BP_AVATAR_FULL_WIDTH;
+ else if ( 'thumb' == $type )
+ $grav_size = BP_AVATAR_THUMB_WIDTH;
+
+ // Set gravatar type
</ins><span class="cx"> if ( empty( $bp->grav_default->{$object} ) )
</span><span class="cx"> $default_grav = 'wavatar';
</span><span class="cx"> else if ( 'mystery' == $bp->grav_default->{$object} )
</span><del>- $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
</del><ins>+ $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_AVATAR_DEFAULT, $grav_size );
</ins><span class="cx"> else
</span><span class="cx"> $default_grav = $bp->grav_default->{$object};
</span><span class="cx">
</span><del>- if ( $width ) $grav_size = $width;
- else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH;
- else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH;
-
</del><ins>+ // Set gravatar object
</ins><span class="cx"> if ( empty( $email ) ) {
</span><span class="cx"> if ( 'user' == $object ) {
</span><span class="cx"> $email = bp_core_get_user_email( $item_id );
</span><span class="lines">@@ -191,13 +200,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Set host based on if using ssl
</ins><span class="cx"> if ( is_ssl() )
</span><span class="cx"> $host = 'https://secure.gravatar.com/avatar/';
</span><span class="cx"> else
</span><span class="cx"> $host = 'http://www.gravatar.com/avatar/';
</span><span class="cx">
</span><del>- $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
- $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
</del><ins>+ // Filter gravatar vars
+ $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
+ $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . $alt . '" class="' . $class . '"' . $css_id . $html_width . $html_height . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>