<!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][5052] trunk/bp-groups: Respect 'disable avatar upload' option within the Groups component.</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/5052">5052</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-08-29 23:07:41 +0000 (Mon, 29 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Respect 'disable avatar upload' option within the Groups component. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3520">#3520</a>. Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsadminbarphp">trunk/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsbuddybarphp">trunk/bp-groups/bp-groups-buddybar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.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="trunkbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-adminbar.php (5051 => 5052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-adminbar.php 2011-08-29 22:58:52 UTC (rev 5051)
+++ trunk/bp-groups/bp-groups-adminbar.php 2011-08-29 23:07:41 UTC (rev 5052)
</span><span class="lines">@@ -67,12 +67,14 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Group Admin > Group avatar
</span><del>- $wp_admin_bar->add_menu( array(
- 'parent' => $bp->group_admin_menu_id,
- 'id' => 'group-avatar',
- 'title' => __( 'Edit Avatar', 'buddypress' ),
- 'href' => bp_get_groups_action_link( 'admin/group-avatar' )
- ) );
</del><ins>+ if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $bp->group_admin_menu_id,
+ 'id' => 'group-avatar',
+ 'title' => __( 'Edit Avatar', 'buddypress' ),
+ 'href' => bp_get_groups_action_link( 'admin/group-avatar' )
+ ) );
+ }
</ins><span class="cx">
</span><span class="cx"> // Group Admin > Manage invitations
</span><span class="cx"> if ( bp_is_active( 'friends' ) ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsbuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-buddybar.php (5051 => 5052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-buddybar.php 2011-08-29 22:58:52 UTC (rev 5051)
+++ trunk/bp-groups/bp-groups-buddybar.php 2011-08-29 23:07:41 UTC (rev 5052)
</span><span class="lines">@@ -20,8 +20,12 @@
</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>- <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
</del><ins>+ <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</ins><span class="cx">
</span><ins>+ <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+
+ <?php endif; ?>
+
</ins><span class="cx"> <?php if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <li><a href="<?php bp_groups_action_link( 'send-invites' ); ?>"><?php _e( 'Manage Invitations', 'buddypress' ); ?></a></li>
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5051 => 5052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2011-08-29 22:58:52 UTC (rev 5051)
+++ trunk/bp-groups/bp-groups-loader.php 2011-08-29 23:07:41 UTC (rev 5052)
</span><span class="lines">@@ -188,12 +188,17 @@
</span><span class="cx"> 'group-settings' => array(
</span><span class="cx"> 'name' => __( 'Settings', 'buddypress' ),
</span><span class="cx"> 'position' => 10
</span><del>- ),
- 'group-avatar' => array(
- 'name' => __( 'Avatar', 'buddypress' ),
- 'position' => 20 ),
</del><ins>+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ // If avatar uploads are not disabled, add avatar option
+ if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+ $this->group_creation_steps['group-avatar'] = array(
+ 'name' => __( 'Avatar', 'buddypress' ),
+ 'position' => 20
+ );
+ }
+
</ins><span class="cx"> // If friends component is active, add invitations
</span><span class="cx"> if ( bp_is_active( 'friends' ) ) {
</span><span class="cx"> $this->group_creation_steps['group-invites'] = array(
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (5051 => 5052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-08-29 22:58:52 UTC (rev 5051)
+++ trunk/bp-groups/bp-groups-screens.php 2011-08-29 23:07:41 UTC (rev 5052)
</span><span class="lines">@@ -544,7 +544,8 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_groups_component() && bp_is_action_variable( 'group-avatar', 0 ) ) {
</span><span class="cx">
</span><del>- if ( !$bp->is_item_admin )
</del><ins>+ // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
+ if ( !$bp->is_item_admin || (int)bp_get_option( 'bp-disable-avatar-uploads' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the group admin has deleted the admin avatar
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5051 => 5052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-08-29 22:58:52 UTC (rev 5051)
+++ trunk/bp-groups/bp-groups-template.php 2011-08-29 23:07:41 UTC (rev 5052)
</span><span class="lines">@@ -1277,7 +1277,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> ?>
</span><span class="cx"> <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-settings"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</span><del>- <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</del><ins>+
+ <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+ <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+ <?php endif; ?>
+
</ins><span class="cx"> <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/manage-members"><?php _e( 'Members', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( $groups_template->group->status == 'private' ) : ?>
</span></span></pre>
</div>
</div>
</body>
</html>