Changeset 2622 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

02/08/2010 12:33:13 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1840

File:

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

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

@@ -258 +258 @@
         /* TODO: Merge all these get_() functions into one. */
 
-        function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -281 +281 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -290 +290 @@
         }
 
-        function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -313 +313 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -322 +322 @@
         }
 
-        function get_popular( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_popular( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -346 +346 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -355 +355 @@
         }
 
-        function get_alphabetically( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_alphabetically( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -378 +378 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -387 +387 @@
         }
 
-        function get_by_most_forum_topics( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_by_most_forum_topics( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp, $bbdb;
 
@@ -414 +414 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -423 +423 @@
         }
 
-        function get_by_most_forum_posts( $limit = null, $page = null, $search_terms = false ) {
+        function get_by_most_forum_posts( $limit = null, $page = null, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp, $bbdb;
 
@@ -450 +450 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -503 +503 @@
         }
 
-        function get_by_letter( $letter, $limit = null, $page = null ) {
+        function get_by_letter( $letter, $limit = null, $page = null, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -521 +521 @@
                 $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -530 +530 @@
         }
 
-        function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -553 +553 @@
                 }
 
-                if ( empty( $user_id ) ) {
+                if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
@@ -765 +765 @@
                 $this->inviter_id = 0;
                 $this->is_confirmed = 1;
-                $this->date_modified = time();
+                $this->date_modified = gmdate( "Y-m-d H:i:s" );
         }
 
         function accept_request() {
                 $this->is_confirmed = 1;
-                $this->date_modified = time();
+                $this->date_modified = gmdate( "Y-m-d H:i:s" );
         }