Changeset 5052

Timestamp:

08/29/2011 11:07:41 PM (14 years ago)

Author:

boonebgorges

Message:

Respect 'disable avatar upload' option within the Groups component. Fixes #3520. Props r-a-y

Location:

trunk/bp-groups

Files:

• bp-groups-adminbar.php (modified) (1 diff)
• bp-groups-buddybar.php (modified) (1 diff)
• bp-groups-loader.php (modified) (1 diff)
• bp-groups-screens.php (modified) (1 diff)
• bp-groups-template.php (modified) (1 diff)

trunk/bp-groups/bp-groups-adminbar.php

@@ -68 +68 @@
 
     // Group Admin > Group avatar
-    $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' )
-    ) );
+    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' )
+        ) );
+    }
 
     // Group Admin > Manage invitations

trunk/bp-groups/bp-groups-buddybar.php

@@ -21 +21 @@
             <li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
 
-            <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+            <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+
+                <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+
+            <?php endif; ?>
 
             <?php if ( bp_is_active( 'friends' ) ) : ?>

trunk/bp-groups/bp-groups-loader.php

@@ -189 +189 @@
                 'name'       => __( 'Settings', 'buddypress' ),
                 'position'   => 10
-            ),
-            'group-avatar'   => array(
-                'name'       => __( 'Avatar',   'buddypress' ),
-                'position'   => 20 ),
+            )
         ) );
+
+        // 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
+            );
+        }
 
         // If friends component is active, add invitations

trunk/bp-groups/bp-groups-screens.php

@@ -545 +545 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'group-avatar', 0 ) ) {
 
-        if ( !$bp->is_item_admin )
+        // 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' ) )
             return false;
 

trunk/bp-groups/bp-groups-template.php

@@ -1278 +1278 @@
     ?>
     <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>
-    <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 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; ?>
+
     <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>