Ticket #5345: 5345.diff
| File 5345.diff, 4.5 KB (added by , 13 years ago) |
|---|
-
bp-groups/bp-groups-adminbar.php
57 57 ) ); 58 58 59 59 // Group Admin > Group avatar 60 if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {60 if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) { 61 61 $wp_admin_bar->add_menu( array( 62 62 'parent' => $bp->group_admin_menu_id, 63 63 'id' => 'group-avatar', -
bp-groups/bp-groups-buddybar.php
35 35 36 36 <li><a href="<?php bp_groups_action_link( 'admin/group-settings' ); ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li> 37 37 38 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>38 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) : ?> 39 39 40 40 <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li> 41 41 -
bp-groups/bp-groups-loader.php
307 307 ) ); 308 308 309 309 // If avatar uploads are not disabled, add avatar option 310 if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {310 if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars ) { 311 311 $this->group_creation_steps['group-avatar'] = array( 312 312 'name' => __( 'Avatar', 'buddypress' ), 313 313 'position' => 20 -
bp-groups/bp-groups-screens.php
592 592 return false; 593 593 594 594 // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here 595 if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )595 if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars ) 596 596 return false; 597 597 598 598 $bp = buddypress(); -
bp-groups/bp-groups-template.php
520 520 extract( $r, EXTR_SKIP ); 521 521 522 522 /* Fetch the avatar from the folder, if not provide backwards compat. */ 523 if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $alt ) ) ) 524 $avatar = '<img src="' . esc_url( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />'; 523 if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $alt ) ) ) { 524 if( $bp->avatar->show_avatars ) { 525 $default_avatar = bp_is_group() ? bp_core_avatar_default() : bp_core_avatar_default_thumb(); 526 $avatar = '<img src="' . esc_url( $default_avatar ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />'; 527 } 528 } 525 529 526 530 return apply_filters( 'bp_get_group_avatar', $avatar ); 527 531 } … … 1467 1471 1468 1472 <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> 1469 1473 1470 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>1474 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) : ?> 1471 1475 1472 1476 <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( 'Avatar', 'buddypress' ); ?></a></li> 1473 1477
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)