Changeset 5689 for trunk/bp-groups/bp-groups-template.php

Timestamp:

02/10/2012 01:17:51 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Groups component. See #3989.

File:

• trunk/bp-groups/bp-groups-template.php (modified) (17 diffs)

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

@@ -105 +105 @@
 
         function __construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras, $include = false, $exclude = false, $show_hidden = false ){
-
-                global $bp;
 
                 $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
@@ -163 +161 @@
 
                 // Build pagination links
-                if ( (int)$this->total_group_count && (int)$this->pag_num ) {
+                if ( (int) $this->total_group_count && (int)$this->pag_num ) {
                         $this->pag_links = paginate_links( array(
                                 'base'      => add_query_arg( array( 'grpage' => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
@@ -211 +209 @@
 
         function the_group() {
-                global $group;
-
                 $this->in_the_loop = true;
-                $this->group = $this->next_group();
+                $this->group       = $this->next_group();
 
                 if ( $this->single_group )
@@ -298 +294 @@
 
 function bp_group_is_visible( $group = false ) {
-        global $bp, $groups_template;
+        global $groups_template;
 
         if ( bp_current_user_can( 'bp_moderate' ) )
@@ -382 +378 @@
 
                 $defaults = array(
-                        'type' => 'full',
-                        'width' => false,
+                        'type'   => 'full',
+                        'width'  => false,
                         'height' => false,
-                        'class' => 'avatar',
-                        'id' => false,
-                        'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $groups_template->group->name )
+                        'class'  => 'avatar',
+                        'id'     => false,
+                        'alt'    => sprintf( __( 'Group logo of %s', 'buddypress' ), $groups_template->group->name )
                 );
 
@@ -439 +435 @@
 }
         function bp_get_group_permalink( $group = false ) {
-                global $groups_template, $bp;
+                global $groups_template;
 
                 if ( empty( $group ) )
@@ -451 +447 @@
 }
         function bp_get_group_admin_permalink( $group = false ) {
-                global $groups_template, $bp;
+                global $groups_template;
 
                 if ( empty( $group ) )
@@ -668 +664 @@
 }
         function bp_get_group_all_members_permalink( $group = false ) {
-                global $groups_template, $bp;
+                global $groups_template;
 
                 if ( empty( $group ) )
@@ -677 +673 @@
 
 function bp_group_search_form() {
-        global $groups_template, $bp;
+        global $bp;
 
         $action = $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/search/';
@@ -721 +717 @@
 }
         function bp_get_groups_pagination_count() {
-                global $bp, $groups_template;
+                global $groups_template;
 
                 $start_num = intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1;
-                $from_num = bp_core_number_format( $start_num );
-                $to_num = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
-                $total = bp_core_number_format( $groups_template->total_group_count );
+                $from_num  = bp_core_number_format( $start_num );
+                $to_num    = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
+                $total     = bp_core_number_format( $groups_template->total_group_count );
 
                 return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) );
@@ -1076 +1072 @@
 
 function bp_group_mod_memberlist( $admin_list = false, $group = false ) {
-        global $groups_template, $group_mods;
+        global $groups_template;
 
         if ( empty( $group ) )
@@ -1138 +1134 @@
 
 function bp_group_has_moderators( $group = false ) {
-        global $group_mods, $groups_template;
+        global $groups_template;
 
         if ( empty( $group ) )
@@ -1150 +1146 @@
 }
         function bp_get_group_member_promote_mod_link( $args = '' ) {
-                global $members_template, $groups_template, $bp;
+                global $members_template, $groups_template;
 
                 $defaults = array(
@@ -1167 +1163 @@
 }
         function bp_get_group_member_promote_admin_link( $args = '' ) {
-                global $members_template, $groups_template, $bp;
+                global $members_template, $groups_template;
 
                 $defaults = array(
@@ -1189 +1185 @@
 }
         function bp_get_group_member_demote_link( $user_id = 0, $group = false ) {
-                global $members_template, $groups_template, $bp;
+                global $members_template, $groups_template;
 
                 if ( empty( $group ) )
@@ -1209 +1205 @@
 }
         function bp_get_group_member_ban_link( $user_id = 0, $group = false ) {
-                global $members_template, $groups_template, $bp;
+                global $groups_template;
 
                 if ( empty( $group ) )
@@ -1247 +1243 @@
 }
         function bp_get_group_member_remove_link( $user_id = 0, $group = false ) {
-                global $members_template, $groups_template;
+                global $groups_template;
 
                 if ( empty( $group ) )