Changeset 1180

Timestamp:

03/09/2009 05:34:01 PM (16 years ago)

Author:

apeatling

Message:

Added new user link functions
Added ability to specify a forum ID as the parent forum.
Other minor cleanups

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums.php (modified) (2 diffs)
• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-ajax.php (modified) (4 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)

trunk/bp-core/bp-core-templatetags.php

@@ -286 +286 @@
 }
 
+function bp_get_loggedin_user_link() {
+    global $bp;
+    
+    return $bp->loggedin_user->domain;
+}
+
+function bp_get_displayed_user_link() {
+    global $bp;
+    
+    return $bp->displayed_user->domain;
+}
+
 function bp_core_get_wp_profile() {
     

trunk/bp-forums.php

@@ -19 +19 @@
 
 define ( 'BP_FORUMS_VERSION', '1.0-RC1' );
+define ( 'BP_FORUMS_PARENT_FORUM_ID', apply_filters( 'bp_forums_parent_forum_id', 0 ) );
 
 include_once( 'bp-forums/bp-forums-admin.php' );
@@ -130 +131 @@
 }
 
-function bp_forums_new_forum( $name = '', $desc = '', $parent = 0, $order = 0, $is_category = false ) {
+function bp_forums_new_forum( $name = '', $desc = '', $parent = BP_FORUMS_PARENT_FORUM_ID, $order = 0, $is_category = false ) {
     global $bbpress_live;
     

trunk/bp-groups.php

@@ -1825 +1825 @@
 }
 
-function groups_get_group_users( $group_id, $limit = false, $page = false ) {
+function groups_get_group_members( $group_id, $limit = false, $page = false ) {
     return BP_Groups_Member::get_all_for_group( $group_id, $limit, $page );
 }
+    function groups_get_group_users( $group_id, $limit = false, $page = false, $deprecated_function = true ) {
+        return groups_get_group_members( $group_id, $limit, $page );
+    }
 
 function groups_is_group_admin( $user_id, $group_id ) {

trunk/bp-groups/bp-groups-ajax.php

@@ -24 +24 @@
         echo $user->avatar_thumb;
         echo '<h4>' . $user->user_link . '</h4>';
-        echo '<span class="activity">' . sprintf( __( 'active %s ago', 'buddypress' ), $user->last_active ) . '</span>';
+        echo '<span class="activity">' . $user->last_active . '</span>';
         echo '<div class="action">
                 <a class="remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . $user->id . '">' . __( 'Remove Invite', 'buddypress' ) . '</a> 
@@ -237 +237 @@
             <?php echo $pag_links ?>
         </div>
-
+        
+        <?php $counter = 0; ?>
         <ul id="groups-list" class="item-list">
         <?php foreach ( $groups['groups'] as $group ) : ?>
+            
+            <?php $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : ''; ?>
             <?php $group = new BP_Groups_Group( $group->group_id, false, false ); ?>
-            <li>
+            
+            <li<?php echo $alt ?>>
                 <div class="item-avatar">
                     <img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> <?php _e( 'Avatar', 'buddypress' ) ?>" />
@@ -267 +271 @@
                 <div class="clear"></div>
             </li>
+            
+            <?php $counter++ ?>
         <?php endforeach; ?>
         </ul>   
@@ -323 +329 @@
 
         check_ajax_referer( 'groups_leave_group' );
-
+        
         if ( !groups_leave_group( $group->id ) ) {
             _e( 'Error leaving group', 'buddypress' );

trunk/bp-groups/bp-groups-filters.php

@@ -33 +33 @@
 add_filter( 'bp_group_name', 'stripslashes' );
 
+add_filter( 'groups_new_group_forum_desc', 'bp_create_excerpt' );
+
 ?>

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

@@ -1529 +1529 @@
 
 function bp_group_has_members( $group_id = false, $num_per_page = 10, $exclude_admins_mods = true, $exclude_banned = true ) {
-    global $members_template, $groups_template;
-    
+    global $members_template, $groups_template, $group_obj;
+    
+    if ( !$group_id )
+        $group_id = $group_obj->id;
+        
     if ( !$groups_template )
         $groups_template->group = new BP_Groups_Group( $group_id );
-    
+        
     $members_template = new BP_Groups_Group_Members_Template( $groups_template->group->id, $num_per_page, $exclude_admins_mods, $exclude_banned );