<!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][6601] trunk/bp-core/bp-core-avatars.php: Clean up 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, #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/6601">6601</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-10 13:00:26 +0000 (Mon, 10 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up bp_core_fetch_avatar(). Props jkudish. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4503">#4503</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (6600 => 6601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2012-12-10 12:52:16 UTC (rev 6600)
+++ trunk/bp-core/bp-core-avatars.php 2012-12-10 13:00:26 UTC (rev 6601)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> $def_class = 'avatar';
</span><span class="cx">
</span><span class="cx"> // Set the default variables array
</span><del>- $defaults = array(
</del><ins>+ $params = wp_parse_args( $args, array(
</ins><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'object' => $def_object, // user/group/blog/custom type (if you use filters)
</span><span class="cx"> 'type' => $def_type, // thumb or full
</span><span class="lines">@@ -123,10 +123,7 @@
</span><span class="cx"> 'no_grav' => false, // If there is no avatar found, return false instead of a grav?
</span><span class="cx"> 'html' => true, // Wrap the return img URL in <img />
</span><span class="cx"> 'title' => '' // Custom <img> title (string)
</span><del>- );
-
- // Compare defaults to passed and extract
- $params = wp_parse_args( $args, $defaults );
</del><ins>+ ) );
</ins><span class="cx"> extract( $params, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> /** Set item_id ***********************************************************/
</span><span class="lines">@@ -199,9 +196,6 @@
</span><span class="cx">
</span><span class="cx"> if ( false !== strpos( $alt, '%s' ) || false !== strpos( $alt, '%1$s' ) ) {
</span><span class="cx">
</span><del>- // Get item name for alt/title tags
- $item_name = '';
-
</del><span class="cx"> switch ( $object ) {
</span><span class="cx">
</span><span class="cx"> case 'blog' :
</span><span class="lines">@@ -228,25 +222,35 @@
</span><span class="cx"> if ( empty( $alt ) )
</span><span class="cx"> $alt = __( 'Avatar Image', 'buddypress' );
</span><span class="cx">
</span><ins>+ $html_alt = ' alt="' . esc_attr( $alt ) . '"';
+
</ins><span class="cx"> // Set title tag, if it's been provided
</span><del>- if ( !empty( $title ) )
</del><ins>+ if ( !empty( $title ) ) {
</ins><span class="cx"> $title = " title='" . esc_attr( apply_filters( 'bp_core_avatar_title', $title, $item_id, $object, $params ) ) . "'";
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Set CSS ID if passed
</span><del>- if ( !empty( $css_id ) )
- $css_id = ' id="' . $css_id . '"';
</del><ins>+ if ( !empty( $css_id ) ) {
+ $css_id = ' id="' . esc_attr( $css_id ) . '"';
+ }
</ins><span class="cx">
</span><span class="cx"> // Set image width
</span><del>- if ( false !== $width )
</del><ins>+ if ( false !== $width ) {
</ins><span class="cx"> $html_width = ' width="' . $width . '"';
</span><del>- else
- $html_width = ( 'thumb' == $type ) ? ' width="' . bp_core_avatar_thumb_width() . '"' : ' width="' . bp_core_avatar_full_width() . '"';
</del><ins>+ } elseif ( 'thumb' == $type ) {
+ $html_width = ' width="' . bp_core_avatar_thumb_width() . '"';
+ } else {
+ $html_width = ' width="' . bp_core_avatar_full_width() . '"';
+ }
</ins><span class="cx">
</span><span class="cx"> // Set image height
</span><del>- if ( false !== $height )
</del><ins>+ if ( false !== $height ) {
</ins><span class="cx"> $html_height = ' height="' . $height . '"';
</span><del>- else
- $html_height = ( 'thumb' == $type ) ? ' height="' . bp_core_avatar_thumb_height() . '"' : ' height="' . bp_core_avatar_full_height() . '"';
</del><ins>+ } elseif ( 'thumb' == $type ) {
+ $html_height = ' height="' . bp_core_avatar_thumb_height() . '"';
+ } else {
+ $html_height = ' height="' . bp_core_avatar_full_height() . '"';
+ }
</ins><span class="cx">
</span><span class="cx"> // Set img URL and DIR based on prepopulated constants
</span><span class="cx"> $avatar_loc = new stdClass();
</span><span class="lines">@@ -258,9 +262,9 @@
</span><span class="cx"> $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', ( $avatar_loc->path . $avatar_loc->dir . $item_id ), $item_id, $object, $avatar_dir );
</span><span class="cx">
</span><span class="cx"> // Add an identifying class
</span><del>- $class .= ' ' . $object . '-' . $item_id . '-avatar';
</del><ins>+ $class .= ' ' . $object . '-' . $item_id . '-avatar ' . sanitize_html_class( "avatar-$width" ) . ' photo';
</ins><span class="cx">
</span><del>- /****
</del><ins>+ /**
</ins><span class="cx"> * Look for uploaded avatar first. Use it if it exists.
</span><span class="cx"> * Set the file names to search for, to select the full size
</span><span class="cx"> * or thumbnail image.
</span><span class="lines">@@ -322,8 +326,8 @@
</span><span class="cx">
</span><span class="cx"> // Return it wrapped in an <img> element
</span><span class="cx"> if ( true === $html ) {
</span><del>- return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
-
</del><ins>+ return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $html_alt . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+
</ins><span class="cx"> // ...or only the URL
</span><span class="cx"> } else {
</span><span class="cx"> return apply_filters( 'bp_core_fetch_avatar_url', $avatar_url );
</span><span class="lines">@@ -364,7 +368,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set host based on if using ssl
</span><del>- $host = 'http://www.gravatar.com/avatar/';
</del><ins>+ $host = 'http://gravatar.com/avatar/';
</ins><span class="cx"> if ( is_ssl() ) {
</span><span class="cx"> $host = 'https://secure.gravatar.com/avatar/';
</span><span class="cx"> }
</span><span class="lines">@@ -375,18 +379,20 @@
</span><span class="cx">
</span><span class="cx"> // Gravatar rating; http://bit.ly/89QxZA
</span><span class="cx"> $rating = get_option( 'avatar_rating' );
</span><del>- if ( ! empty( $rating ) )
</del><ins>+ if ( ! empty( $rating ) ) {
</ins><span class="cx"> $gravatar .= "&amp;r={$rating}";
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // No avatar was found, and we've been told not to use a gravatar.
</span><span class="cx"> } else {
</span><span class="cx"> $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( true === $html )
- return apply_filters( 'bp_core_fetch_avatar', '<img src="' . esc_attr( $gravatar ) . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
- else
</del><ins>+ if ( true === $html ) {
+ return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $html_alt . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+ } else {
</ins><span class="cx"> return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>