<!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][8759] trunk/src/bp-blogs/bp-blogs-template.php: Bring `bp_get_blog_avatar()` up to speed with `bp_get_group_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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8759">8759</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-08-05 16:23:56 +0000 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring `bp_get_blog_avatar()` up to speed with `bp_get_group_avatar()`:
* Add inline doc
* Use `bp_parse_args()`
* Add brackets and bring code formatting up to date</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogstemplatephp">trunk/src/bp-blogs/bp-blogs-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-template.php (8758 => 8759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-template.php 2014-08-05 16:10:55 UTC (rev 8758)
+++ trunk/src/bp-blogs/bp-blogs-template.php 2014-08-05 16:23:56 UTC (rev 8759)
</span><span class="lines">@@ -478,25 +478,37 @@
</span><span class="cx"> * @type int|bool $width Default: false.
</span><span class="cx"> * @type int|bool $height Default: false.
</span><span class="cx"> * @type bool $id Currently unused.
</span><del>- * @type bool $no_grav Default: false.
</del><ins>+ * @type bool $no_grav Default: true.
</ins><span class="cx"> * }
</span><span class="cx"> * @return string User avatar string.
</span><span class="cx"> */
</span><span class="cx"> function bp_get_blog_avatar( $args = '' ) {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- $defaults = array(
</del><ins>+ // Parse the arguments
+ $r = bp_parse_args( $args, array(
</ins><span class="cx"> 'type' => 'full',
</span><span class="cx"> 'width' => false,
</span><span class="cx"> 'height' => false,
</span><span class="cx"> 'class' => 'avatar',
</span><span class="cx"> 'id' => false,
</span><span class="cx"> 'alt' => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), bp_core_get_user_displayname( $blogs_template->blog->admin_user_id ) ),
</span><del>- 'no_grav' => true
- );
</del><ins>+ 'no_grav' => true,
+ ) );
</ins><span class="cx">
</span><del>- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
</del><ins>+ // Fetch the avatar
+ $avatar = bp_core_fetch_avatar( array(
+ 'item_id' => $blogs_template->blog->admin_user_id,
+ 'title' => $blogs_template->blog->admin_user_email,
+ //'avatar_dir' => 'blog-avatars',
+ //'object' => 'blog',
+ 'type' => $r['type'],
+ 'alt' => $r['alt'],
+ 'css_id' => $r['id'],
+ 'class' => $r['class'],
+ 'width' => $r['width'],
+ 'height' => $r['height']
+ ) );
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * In future BuddyPress versions you will be able to set the avatar for a blog.
</span><span class="lines">@@ -506,9 +518,9 @@
</span><span class="cx"> * This filter is deprecated as of BuddyPress 1.5 and may be removed in a future version.
</span><span class="cx"> * Use the 'bp_get_blog_avatar' filter instead.
</span><span class="cx"> */
</span><del>- $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, bp_core_fetch_avatar( array( 'item_id' => $blogs_template->blog->admin_user_id, 'type' => $type, 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class, 'email' => $blogs_template->blog->admin_user_email ) ) );
</del><ins>+ $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_blog_avatar', $avatar, $blogs_template->blog->blog_id, array( 'item_id' => $blogs_template->blog->admin_user_id, 'type' => $type, 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class, 'email' => $blogs_template->blog->admin_user_email ) );
</del><ins>+ return apply_filters( 'bp_get_blog_avatar', $avatar, $blogs_template->blog->blog_id, $r );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blog_permalink() {
</span></span></pre>
</div>
</div>
</body>
</html>