<!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][8737] trunk/src: Disable Group avatar feature if WordPress show avatars setting is disabled</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/8737">8737</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-07-30 17:36:09 +0000 (Wed, 30 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable Group avatar feature if WordPress show avatars setting is disabled
In WordPress Administration Discussion settings, if the option "Show Avatars" is not on, we need to disable the Group Avatar feature to avoid some notices and be consistent with the discussion option.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5345">#5345</a>
See <a href="http://buddypress.trac.wordpress.org/ticket/5494">#5494</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoredeprecated21php">trunk/src/bp-core/deprecated/2.1.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsadminphp">trunk/src/bp-groups/bp-groups-admin.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsadminbarphp">trunk/src/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsloaderphp">trunk/src/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoredeprecated21php"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/deprecated/2.1.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/deprecated/2.1.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-core/deprecated/2.1.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx">
</span><span class="cx"> <li><a href="<?php bp_groups_action_link( 'admin/group-settings' ); ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span><del>- <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</del><ins>+ <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) : ?>
</ins><span class="cx">
</span><span class="cx"> <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-admin.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-admin.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-groups/bp-groups-admin.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -1404,17 +1404,21 @@
</span><span class="cx"> $actions = apply_filters( 'bp_groups_admin_comment_row_actions', array_filter( $actions ), $item );
</span><span class="cx">
</span><span class="cx"> // Get group name and avatar
</span><del>- $avatar = bp_core_fetch_avatar( array(
- 'item_id' => $item['id'],
- 'object' => 'group',
- 'type' => 'thumb',
- 'avatar_dir' => 'group-avatars',
- 'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
- 'width' => '32',
- 'height' => '32',
- 'title' => $group_name
- ) );
</del><ins>+ $avatar = '';
</ins><span class="cx">
</span><ins>+ if ( buddypress()->avatar->show_avatars ) {
+ $avatar = bp_core_fetch_avatar( array(
+ 'item_id' => $item['id'],
+ 'object' => 'group',
+ 'type' => 'thumb',
+ 'avatar_dir' => 'group-avatars',
+ 'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
+ 'width' => '32',
+ 'height' => '32',
+ 'title' => $group_name
+ ) );
+ }
+
</ins><span class="cx"> $content = sprintf( '<strong><a href="%s">%s</a></strong>', esc_url( $edit_url ), $group_name );
</span><span class="cx">
</span><span class="cx"> echo $avatar . ' ' . $content . ' ' . $this->row_actions( $actions );
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-adminbar.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-adminbar.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-groups/bp-groups-adminbar.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Group Admin > Group avatar
</span><del>- if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
</del><ins>+ if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) {
</ins><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => $bp->group_admin_menu_id,
</span><span class="cx"> 'id' => 'group-avatar',
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-loader.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-loader.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-groups/bp-groups-loader.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // If avatar uploads are not disabled, add avatar option
</span><del>- if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
</del><ins>+ if ( ! (int) $bp->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars ) {
</ins><span class="cx"> $this->group_creation_steps['group-avatar'] = array(
</span><span class="cx"> 'name' => _x( 'Profile Photo', 'Group screen nav', 'buddypress' ),
</span><span class="cx"> 'position' => 20
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-screens.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-screens.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-groups/bp-groups-screens.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
</span><del>- if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )
</del><ins>+ if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $bp = buddypress();
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-template.php (8736 => 8737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-template.php 2014-07-30 15:09:56 UTC (rev 8736)
+++ trunk/src/bp-groups/bp-groups-template.php 2014-07-30 17:36:09 UTC (rev 8737)
</span><span class="lines">@@ -555,6 +555,10 @@
</span><span class="cx"> function bp_get_group_avatar( $args = '' ) {
</span><span class="cx"> global $bp, $groups_template;
</span><span class="cx">
</span><ins>+ if ( ! buddypress()->avatar->show_avatars ) {
+ return false;
+ }
+
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'type' => 'full',
</span><span class="cx"> 'width' => false,
</span><span class="lines">@@ -1558,7 +1562,7 @@
</span><span class="cx">
</span><span class="cx"> <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span><del>- <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</del><ins>+ <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && buddypress()->avatar->show_avatars ) : ?>
</ins><span class="cx">
</span><span class="cx"> <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Profile Photo', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span><span class="lines">@@ -1708,7 +1712,7 @@
</span><span class="cx"> if ( empty( $group ) ) {
</span><span class="cx"> $group = $groups_template->group;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $user_id ) ) {
</span><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>