Ticket #6387: bp-groups-template.php.patch

src/bp-groups/bp-groups-template.php

@@ -2457 +2457 @@
          * @return string
          */
         function bp_get_group_member_promote_admin_link( $args = '' ) {
-                global $members_template, $groups_template;
+                global $members_template;
 
                 $defaults = array(
                         'user_id' => !empty( $members_template->member->user_id ) ? $members_template->member->user_id : false,
-                        'group'   => &$groups_template->group
+                        'group'   => groups_get_current_group()
                 );
 
                 $r = wp_parse_args( $args, $defaults );
@@ -2500 +2500 @@
          * @return string
          */
         function bp_get_group_member_demote_link( $user_id = 0, $group = false ) {
-                global $members_template, $groups_template;
+                global $members_template;
 
                 if ( empty( $group ) )
-                        $group =& $groups_template->group;
+                        $group =groups_get_current_group();
 
                 if ( !$user_id )
                         $user_id = $members_template->member->user_id;
@@ -2541 +2541 @@
          * @return string
          */
         function bp_get_group_member_ban_link( $user_id = 0, $group = false ) {
-                global $groups_template;
 
                 if ( empty( $group ) )
-                        $group =& $groups_template->group;
+                        $group =groups_get_current_group();
 
                 /**
                  * Filters a URL for banning a member from a group.
@@ -2579 +2578 @@
          * @return string
          */
         function bp_get_group_member_unban_link( $user_id = 0, $group = false ) {
-                global $members_template, $groups_template;
+                global $members_template;
 
                 if ( !$user_id )
                         $user_id = $members_template->member->user_id;
 
                 if ( empty( $group ) )
-                        $group =& $groups_template->group;
+                        $group =groups_get_current_group();
 
                 /**
                  * Filters a URL for unbanning a member from a group.
@@ -2620 +2619 @@
          * @return string
          */
         function bp_get_group_member_remove_link( $user_id = 0, $group = false ) {
-                global $groups_template;
-
+                
                 if ( empty( $group ) )
-                        $group =& $groups_template->group;
+                        $group =groups_get_current_group();
 
                 /**
                  * Filters a URL for removing a member from a group.
@@ -2929 +2927 @@
          * @return string
          */
         function bp_get_group_accept_invite_link( $group = false ) {
-                global $groups_template;
-
+                
                 if ( empty( $group ) )
-                        $group =& $groups_template->group;
+                        $group =groups_get_current_group();
 
                 $bp = buddypress();