Ticket #3271: 3271.2.patch

bp-groups/bp-groups-template.php

@@ -578 +578 @@
 
 }
 
+/**
+ * Return a list of user_ids for a group's admins
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param obj $group (optional) The group being queried. Defaults to the current group in the loop
+ * @param str $format 'string' to get a comma-separated string, 'array' to get an array
+ * @return mixed $admin_ids A string or array of user_ids
+ */
+function bp_group_admin_ids( $group = false, $format = 'string' ) {
+        global $groups_template;
+
+        if ( !$group )
+                $group =& $groups_template->group;
+
+        $admin_ids = array();
+
+        if ( $group->admins ) { 
+                foreach( $group->admins as $admin ) {
+                        $admin_ids[] = $admin->user_id;
+                }
+        }
+                        
+        if ( 'string' == $format ) 
+                $admin_ids = implode( ',', $admin_ids );
+        
+        return apply_filters( 'bp_group_admin_ids', $admin_ids );
+}
+
+/**
+ * Return a list of user_ids for a group's moderators
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param obj $group (optional) The group being queried. Defaults to the current group in the loop
+ * @param str $format 'string' to get a comma-separated string, 'array' to get an array
+ * @return mixed $mod_ids A string or array of user_ids
+ */
+function bp_group_mod_ids( $group = false, $format = 'string' ) {
+        global $groups_template;
+
+        if ( !$group )
+                $group =& $groups_template->group;
+
+        $mod_ids = array();
+
+        if ( $group->mods ) { 
+                foreach( $group->mods as $mod ) {
+                        $mod_ids[] = $mod->user_id;
+                }
+        }
+        
+        if ( 'string' == $format ) 
+                $mod_ids = implode( ',', $mod_ids );
+        
+        return apply_filters( 'bp_group_mod_ids', $mod_ids );
+}
+
 function bp_group_all_members_permalink() {
         echo bp_get_group_all_members_permalink();
 }
@@ -959 +1019 @@
                 global $members_template, $groups_template, $bp;
 
                 $defaults = array(
-                        'user_id' => $members_template->member->user_id,
+                        'user_id' => !empty( $members_template->member->user_id ) ? $members_template->member->user_id : false,
                         'group'   => &$groups_template->group
                 );
 

bp-themes/bp-default/groups/single/admin.php

@@ -147 +147 @@
 <?php if ( bp_is_group_admin_screen( 'manage-members' ) ) : ?>
 
         <?php do_action( 'bp_before_group_manage_members_admin' ); ?>
-
+        
         <div class="bp-widget">
                 <h4><?php _e( 'Administrators', 'buddypress' ); ?></h4>
-                <?php bp_group_admin_memberlist( true ) ?>
-        </div>
 
-        <?php if ( bp_group_has_moderators() ) : ?>
+                <?php if ( bp_has_members( '&include='. bp_group_admin_ids() ) ) : ?>
+                
+                <ul id="admins-list" class="item-list single-line>">
+                        
+                        <?php while ( bp_members() ) : bp_the_member(); ?>
+                        <li>
+                                <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
+                                <h5>
+                                        <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+                                        <span class="small">
+                                                <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>
+                                        </span>                 
+                                </h5>           
+                        </li>
+                        <?php endwhile; ?>
+                
+                </ul>
+                
+                <?php endif; ?>
 
+        </div>
+        
+        <?php if ( bp_group_has_moderators() ) : ?>
                 <div class="bp-widget">
-                        <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>
-                        <?php bp_group_mod_memberlist( true ) ?>
+                        <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>              
+                        
+                        <?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
+                                <ul id="mods-list" class="item-list">
+                                
+                                        <?php while ( bp_members() ) : bp_the_member(); ?>                                      
+                                        <li>
+                                                <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
+                                                <h5>
+                                                        <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+                                                        <span class="small">
+                                                                <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ) ?>" class="button confirm mod-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
+                                                                <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>
+                                                        </span>         
+                                                </h5>           
+                                        </li>   
+                                        <?php endwhile; ?>                      
+                                
+                                </ul>
+                        
+                        <?php endif; ?>
                 </div>
+        <?php endif ?>
 
-        <?php endif; ?>
 
         <div class="bp-widget">
                 <h4><?php _e("Members", "buddypress"); ?></h4>