Changeset 7976

Timestamp:

02/24/2014 02:08:24 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Inline doc, code formatting, and micro-optimizations to BP_Groups_Group::populate().

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (4 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -175 +175 @@
          */
         public function populate() {
-                global $wpdb, $bp;
-
+                global $wpdb;
+
+                // Get BuddyPress
+                $bp    = buddypress();
+
+                // Check cache for group data
                 $group = wp_cache_get( $this->id, 'bp_groups' );
+
+                // Cache missed, so query the DB
                 if ( false === $group ) {
                         $group = $wpdb->get_row( $wpdb->prepare( "SELECT g.* FROM {$bp->groups->table_name} g WHERE g.id = %d", $this->id ) );
                 }
 
-                if ( empty( $group ) ) {
+                // No group found so set the ID and bail
+                if ( empty( $group ) || is_wp_error( $group ) ) {
                         $this->id = 0;
                         return;
                 }
 
+                // Group found so setup the object variables
                 $this->id           = $group->id;
                 $this->creator_id   = $group->creator_id;
@@ -196 +204 @@
                 $this->date_created = $group->date_created;
 
+                // Are we getting extra group data?
                 if ( ! empty( $this->args['populate_extras'] ) ) {
-                        $this->last_activity      = groups_get_groupmeta( $this->id, 'last_activity' );
+
+                        // Set up some specific group vars from meta
+                        $this->last_activity      = groups_get_groupmeta( $this->id, 'last_activity'      );
                         $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
 
@@ -203 +214 @@
                         $admin_mods = $wpdb->get_results( apply_filters( 'bp_group_admin_mods_user_join_filter', $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ) ) );
 
+                        // Add admins and moderators to their respective arrays
                         foreach ( (array) $admin_mods as $user ) {
-                                if ( (int) $user->is_admin ) {
+                                if ( !empty( $user->is_admin ) ) {
                                         $this->admins[] = $user;
                                 } else {
@@ -211 +223 @@
                         }
 
-                        // Cache general (non-user-specific)
-                        // information about the group
+                        // Cache the group object before user-specific data is added
                         wp_cache_set( $this->id, $this, 'bp_groups' );
-                }
-
-                // Set user-specific data
-                if ( ! empty( $this->args['populate_extras'] ) ) {
-                        $this->is_member  = BP_Groups_Member::check_is_member( bp_loggedin_user_id(), $this->id );
-                        $this->is_invited = BP_Groups_Member::check_has_invite( bp_loggedin_user_id(), $this->id );
-                        $this->is_pending = BP_Groups_Member::check_for_membership_request( bp_loggedin_user_id(), $this->id );
+
+                        // Set user-specific data
+                        $user_id          = bp_loggedin_user_id();
+                        $this->is_member  = BP_Groups_Member::check_is_member( $user_id, $this->id );
+                        $this->is_invited = BP_Groups_Member::check_has_invite( $user_id, $this->id );
+                        $this->is_pending = BP_Groups_Member::check_for_membership_request( $user_id, $this->id );
 
                         // If this is a private or hidden group, does the current user have access?
-                        if ( 'private' == $this->status || 'hidden' == $this->status ) {
-                                if ( $this->is_member && is_user_logged_in() || bp_current_user_can( 'bp_moderate' ) )
+                        if ( ( 'private' === $this->status ) || ( 'hidden' === $this->status ) ) {
+
+                                // Assume user does not have access to hidden/private groups
+                                $this->user_has_access = false;
+
+                                // Group members or community moderators have access
+                                if ( ( $this->is_member && is_user_logged_in() ) || bp_current_user_can( 'bp_moderate' ) ) {
                                         $this->user_has_access = true;
-                                else
-                                        $this->user_has_access = false;
+                                }
                         } else {
                                 $this->user_has_access = true;