Changeset 2088 for trunk/bp-groups/bp-groups-templatetags.php

Timestamp:

11/13/2009 01:01:37 AM (17 years ago)

Author:

apeatling

Message:

Initial support for threaded activity stream commenting. Some major performance improvements around fetching profile and group data.

File:

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

trunk/bp-groups/bp-groups-templatetags.php

@@ -247 +247 @@
                 $this->group = $this->next_group();
 
-                // If this is a single group then instantiate group meta when creating the object.
-                if ( $this->single_group ) {
-                        if ( !$group = wp_cache_get( 'groups_group_' . $this->group->group_id, 'bp' ) ) {
-                                $group = new BP_Groups_Group( $this->group->group_id, true );
-                                wp_cache_set( 'groups_group_' . $this->group->group_id, $group, 'bp' );
-                        }
-                } else {
-                        if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
-                                $group = new BP_Groups_Group( $this->group->group_id, false, false );
-                                wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
-                        }
-                }
-
-                $this->group = $group;
+                if ( $this->single_group )
+                        $this->group = new BP_Groups_Group( $this->group->group_id, true, true );
 
                 if ( 0 == $this->current_group ) // loop has just started
@@ -282 +270 @@
         extract( $r, EXTR_SKIP );
 
-        /* The following code will auto set parameters based on the page being viewed.
-         * for example on example.com/members/andy/groups/my-groups/most-popular/
-         * $type = 'most-popular'
-         */
-        if ( 'my-groups' == $bp->current_action ) {
-                $order = $bp->action_variables[0];
-                if ( 'recently-joined' == $order )
-                        $type = 'recently-joined';
-                else if ( 'most-popular' == $order )
-                        $type = 'popular';
-                else if ( 'admin-of' == $order )
-                        $type = 'admin-of';
-                else if ( 'mod-of' == $order )
-                        $type = 'mod-of';
-                else if ( 'alphabetically' == $order )
-                        $type = 'alphabetical';
-        } else if ( 'invites' == $bp->current_action ) {
-                $type = 'invites';
-        } else if ( $bp->groups->current_group->slug ) {
-                $type = 'single-group';
-                $slug = $bp->groups->current_group->slug;
+        if ( '' == $args ) {
+                /* The following code will auto set parameters based on the page being viewed.
+                 * for example on example.com/members/andy/groups/my-groups/most-popular/
+                 * $type = 'most-popular'
+                 */
+                if ( 'my-groups' == $bp->current_action ) {
+                        $order = $bp->action_variables[0];
+                        if ( 'recently-joined' == $order )
+                                $type = 'recently-joined';
+                        else if ( 'most-popular' == $order )
+                                $type = 'popular';
+                        else if ( 'admin-of' == $order )
+                                $type = 'admin-of';
+                        else if ( 'mod-of' == $order )
+                                $type = 'mod-of';
+                        else if ( 'alphabetically' == $order )
+                                $type = 'alphabetical';
+                } else if ( 'invites' == $bp->current_action ) {
+                        $type = 'invites';
+                } else if ( $bp->groups->current_group->slug ) {
+                        $type = 'single-group';
+                        $slug = $bp->groups->current_group->slug;
+                }
         }
 
@@ -470 +460 @@
                         $group =& $groups_template->group;
 
-                $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
+                $last_active = $group->last_activity;
+
+                if ( !$last_active )
+                        $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
 
                 if ( empty( $last_active ) ) {
@@ -1997 +1990 @@
         }
 
-function bp_the_site_group_avatar() {
-        echo bp_get_the_site_group_avatar();
-}
-        function bp_get_the_site_group_avatar() {
+function bp_the_site_group_avatar( $args = '' ) {
+        echo bp_get_the_site_group_avatar( $args );
+}
+        function bp_get_the_site_group_avatar( $args = '' ) {
                 global $site_groups_template;
 
-                return apply_filters( 'bp_the_site_group_avatar', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => 'full', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) );
+                $defaults = array(
+                        'type' => 'full',
+                        'width' => false,
+                        'height' => false,
+                        'class' => 'avatar',
+                        'id' => false,
+                        'alt' => __( 'Group avatar', 'buddypress' )
+                );
+
+                $r = wp_parse_args( $args, $defaults );
+                extract( $r, EXTR_SKIP );
+
+                return apply_filters( 'bp_the_site_group_avatar', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) );
         }