<!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][7745] trunk/bp-groups: On single group screens, uses default avatar as a fallback in group navigation menu</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/7745">7745</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-01-21 00:16:37 +0000 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>On single group screens, uses default avatar as a fallback in group navigation menu
In case the WordPress Discussion Avatar display setting is disabled, using bp_group_current_avatar() to set group navigation menu was outputing an unfound image making the group edit screens unavailable. This fix uses default avatar as a fallback if no group avatar has been found to build the group navigation menu. It also keeps bp_group_current_avatar() function in case it is still used by a plugin or a theme, but this function now outputs the current avatar.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5343">#5343</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (7744 => 7745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2014-01-20 22:35:17 UTC (rev 7744)
+++ trunk/bp-groups/bp-groups-loader.php 2014-01-21 00:16:37 UTC (rev 7745)
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( empty( $bp->bp_options_avatar ) ) {
</span><del>- $bp->bp_options_avatar = bp_group_current_avatar();
</del><ins>+ $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (7744 => 7745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-01-20 22:35:17 UTC (rev 7744)
+++ trunk/bp-groups/bp-groups-template.php 2014-01-21 00:16:37 UTC (rev 7745)
</span><span class="lines">@@ -2626,20 +2626,41 @@
</span><span class="cx"> * Group Avatar Template Tags
</span><span class="cx"> **/
</span><span class="cx">
</span><del>-function bp_group_current_avatar() {
- global $bp;
</del><ins>+/**
+ * Outputs the current group avatar
+ *
+ * @since BuddyPress (1.0)
+ * @param string $type thumb or full ?
+ * @uses bp_get_group_current_avatar() to get the avatar of the current group
+ */
+function bp_group_current_avatar( $type = 'thumb' ) {
+ echo bp_get_group_current_avatar( $type );
+}
+
+ /**
+ * Returns the current group avatar
+ *
+ * @since BuddyPress (2.0)
+ * @param string $type thumb or full ?
+ * @uses bp_core_fetch_avatar() to get the avatar of the group
+ * @uses bp_get_current_group_id() to get current group id
+ * @uses apply_filters() Filter bp_get_group_current_avatar to modify return value
+ * @return string $tab The current tab's slug
+ */
+ function bp_get_group_current_avatar( $type = 'thumb' ) {
</ins><span class="cx">
</span><del>- if ( $bp->groups->current_group->avatar_full ) { ?>
</del><ins>+ $group_avatar = bp_core_fetch_avatar( array(
+ 'item_id' => bp_get_current_group_id(),
+ 'object' => 'group',
+ 'type' => $type,
+ 'avatar_dir' => 'group-avatars',
+ 'alt' => __( 'Group avatar', 'buddypress' ),
+ 'class' => 'avatar'
+ ) );
</ins><span class="cx">
</span><del>- <img src="<?php echo esc_url( $bp->groups->current_group->avatar_full ); ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
</del><ins>+ return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
+ }
</ins><span class="cx">
</span><del>- <?php } else { ?>
-
- <img src="<?php echo esc_url( $bp->groups->image_base . '/none.gif' ); ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
-
- <?php }
-}
-
</del><span class="cx"> function bp_get_group_has_avatar() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>