<!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] [2255] trunk:
Updating blog avatar support so it at least shows the gravatar of the main admin user for the blog
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2255</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-04 10:29:26 +0000 (Mon, 04 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating blog avatar support so it at least shows the gravatar of the main admin user for the blog. Upload functionality still needs to be implemented.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (2254 => 2255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2010-01-04 09:54:22 UTC (rev 2254)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2010-01-04 10:29:26 UTC (rev 2255)
</span><span class="lines">@@ -186,37 +186,34 @@
</span><span class="cx"> return apply_filters( 'bp_get_blogs_pagination_links', $blogs_template->pag_links );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_blog_avatar() {
- echo bp_get_blog_avatar();
</del><ins>+function bp_blog_avatar( $args = '' ) {
+ echo bp_get_blog_avatar( $args );
</ins><span class="cx"> }
</span><del>- function bp_get_blog_avatar() {
</del><ins>+ function bp_get_blog_avatar( $args = '' ) {
</ins><span class="cx"> global $blogs_template, $bp;
</span><span class="cx">
</span><ins>+ $defaults = array(
+ 'type' => 'full',
+ 'width' => false,
+ 'height' => false,
+ 'class' => 'avatar',
+ 'id' => false,
+ 'alt' => __( 'Blog avatar', 'buddypress' )
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r, EXTR_SKIP );
+
</ins><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="cx"> * Right now you can use a filter with the ID of the blog to change it if you wish.
</span><span class="cx"> */
</span><del>- return apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
</del><ins>+ return apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, bp_core_fetch_avatar( array( 'item_id' => $blogs_template->blog->blog_id, 'object' => 'blog', 'type' => $type, 'avatar_dir' => 'blog-avatars', 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class, 'email' => get_blog_option( $blogs_template->blog->blog_id, 'admin_email' ) ) ) );
</ins><span class="cx"> }
</span><ins>+ /* DEPRECATED */
+ function bp_blog_avatar_thumb() { echo bp_get_blog_avatar('type=thumb'); }
+ function bp_blog_avatar_mini() { echo bp_get_blog_avatar_mini('type=thumb&width=30&height=30'); }
</ins><span class="cx">
</span><del>-function bp_blog_avatar_thumb() {
- echo bp_get_blog_avatar_thumb();
-}
- function bp_get_blog_avatar_thumb() {
- global $blogs_template, $bp;
-
- return apply_filters( 'bp_get_blog_avatar_thumb_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
- }
-
-function bp_blog_avatar_mini() {
- echo bp_get_blog_avatar_mini();
-}
- function bp_get_blog_avatar_mini() {
- global $blogs_template, $bp;
-
- return apply_filters( 'bp_get_blog_avatar_mini_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
- }
-
</del><span class="cx"> function bp_blog_permalink() {
</span><span class="cx"> echo bp_get_blog_permalink();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (2254 => 2255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-01-04 09:54:22 UTC (rev 2254)
+++ trunk/bp-core/bp-core-avatars.php 2010-01-04 10:29:26 UTC (rev 2255)
</span><span class="lines">@@ -139,11 +139,12 @@
</span><span class="cx"> else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH;
</span><span class="cx"> else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH;
</span><span class="cx">
</span><del>- if ( 'user' == $object ) {
- if ( empty( $email ) )
</del><ins>+ if ( empty( $email ) ) {
+ if ( 'user' == $object ) {
</ins><span class="cx"> $email = bp_core_get_user_email( $item_id );
</span><del>- } else if ( 'group' == $object || 'blog' == $object ) {
- $email = "{$item_id}-{$object}@{$bp->root_domain}";
</del><ins>+ } else if ( 'group' == $object || 'blog' == $object ) {
+ $email = "{$item_id}-{$object}@{$bp->root_domain}";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
</span></span></pre>
</div>
</div>
</body>
</html>