Changeset 1408

Timestamp:

04/27/2009 02:20:42 PM (17 years ago)

Author:

apeatling

Message:

Added get_() functions for all template functions so that values can be returned inside of template loops as well as echoed.

Location:

trunk

Files:

• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (6 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (5 diffs)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (3 diffs)
• bp-friends.php (modified) (1 diff)
• bp-friends/bp-friends-filters.php (deleted)
• bp-friends/bp-friends-templatetags.php (modified) (1 diff)
• bp-groups.php (modified) (21 diffs)
• bp-groups/bp-groups-ajax.php (modified) (4 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (4 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (28 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-messages/bp-messages-filters.php (modified) (1 diff)
• bp-messages/bp-messages-templatetags.php (modified) (8 diffs)
• bp-wire/bp-wire-filters.php (modified) (1 diff)
• bp-wire/bp-wire-templatetags.php (modified) (4 diffs)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (5 diffs)

trunk/bp-activity/bp-activity-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_activity_content', 'wptexturize' );
+add_filter( 'bp_get_activity_content', 'wptexturize' );
 
-add_filter( 'bp_activity_content', 'convert_smilies' );
+add_filter( 'bp_get_activity_content', 'convert_smilies' );
 
-add_filter( 'bp_activity_content', 'convert_chars' );
+add_filter( 'bp_get_activity_content', 'convert_chars' );
 
-add_filter( 'bp_activity_content', 'wpautop' );
+add_filter( 'bp_get_activity_content', 'wpautop' );
 
-add_filter( 'bp_activity_content', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
 
-add_filter( 'bp_activity_content', 'make_clickable' );
+add_filter( 'bp_get_activity_content', 'make_clickable' );
 
 ?>

trunk/bp-activity/bp-activity-templatetags.php

@@ -176 +176 @@
     global $bp_activity_title;
     
-    echo apply_filters( 'bp_activities_title', $bp_activity_title );
-}
+    echo bp_get_activities_title();
+}
+    function bp_get_activities_title() {
+        global $bp_activity_title;
+
+        return apply_filters( 'bp_get_activities_title', $bp_activity_title );
+    }
 
 function bp_activities_no_activity() {
     global $bp_activity_no_activity;
-    echo apply_filters( 'bp_activities_no_activity', $bp_activity_no_activity );
-}
+    
+    echo bp_get_activities_no_activity();
+}
+    function bp_get_activities_no_activity() {
+        global $bp_activity_no_activity;
+        
+        return apply_filters( 'bp_get_activities_no_activity', $bp_activity_no_activity );
+    }
 
 function bp_activity_content() {
     global $activities_template;
 
-    if ( bp_is_home() && $activities_template->activity_type == 'personal' ) {
-        echo apply_filters( 'bp_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name ) );                     
-    } else {
-        $activities_template->activity->content = bp_activity_insert_time_since( $activities_template->activity->content, $activities_template->activity->date_recorded );
-        echo apply_filters( 'bp_activity_content', $activities_template->activity->content );
-    }
-}
+    echo bp_get_activity_content();
+}
+    function bp_get_activity_content() {
+        global $activities_template;
+
+        if ( bp_is_home() && $activities_template->activity_type == 'personal' ) {
+            return apply_filters( 'bp_get_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name ) );                       
+        } else {
+            $activities_template->activity->content = bp_activity_insert_time_since( $activities_template->activity->content, $activities_template->activity->date_recorded );
+            return apply_filters( 'bp_get_activity_content', $activities_template->activity->content );
+        }
+    }
 
 function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $filter_words = true, $filter_you = true ) {
@@ -242 +258 @@
 
 function bp_activity_css_class() {
-    global $activities_template;
-    echo apply_filters( 'bp_activity_css_class', $activities_template->activity->component_name );
-}
+    echo bp_get_activity_css_class();
+}
+    function bp_get_activity_css_class() {
+        global $activities_template;
+        
+        return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name );
+    }
 
 function bp_sitewide_activity_feed_link() {
-    global $bp;
-    
-    echo apply_filters( 'bp_sitewide_activity_feed_link', site_url() . '/' . $bp->activity->slug . '/feed' );
-}
+    echo bp_get_sitewide_activity_feed_link();
+}
+    function bp_get_sitewide_activity_feed_link() {
+        global $bp;
+
+        return apply_filters( 'bp_get_sitewide_activity_feed_link', site_url() . '/' . $bp->activity->slug . '/feed' );
+    }
 
 function bp_activities_member_rss_link() {
-    global $bp;
-    
-    if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
-        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
-    else
-        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );      
-}
+    echo bp_get_activities_member_rss_link();
+}
+    function bp_get_activities_member_rss_link() {
+        global $bp;
+
+        if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
+            return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
+        else
+            return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );        
+    }
 
 /* Template tags for RSS feed output */
 
 function bp_activity_feed_item_title() {
-    global $activities_template;
-
-    $title = explode( '<span', $activities_template->activity->content );
-    echo apply_filters( 'bp_activity_feed_item_title', trim( strip_tags( html_entity_decode( $title[0] ) ) ) );
-}
+    echo bp_get_activity_feed_item_title();
+}
+    function bp_get_activity_feed_item_title() {
+        global $activities_template;
+
+        $title = explode( '<span', $activities_template->activity->content );
+        return apply_filters( 'bp_get_activity_feed_item_title', trim( strip_tags( html_entity_decode( $title[0] ) ) ) );
+    }
 
 function bp_activity_feed_item_link() {
-    global $activities_template;
-
-    echo apply_filters( 'bp_activity_feed_item_link', $activities_template->activity->primary_link );
-}
+    echo bp_get_activity_feed_item_link();
+}
+    function bp_get_activity_feed_item_link() {
+        global $activities_template;
+
+        return apply_filters( 'bp_get_activity_feed_item_link', $activities_template->activity->primary_link );
+    }
 
 function bp_activity_feed_item_date() {
-    global $activities_template;
-
-    echo apply_filters( 'bp_activity_feed_item_date', $activities_template->activity->date_recorded );
-}
+    echo bp_get_activity_feed_item_date();
+}
+    function bp_get_activity_feed_item_date() {
+        global $activities_template;
+
+        return apply_filters( 'bp_get_activity_feed_item_date', $activities_template->activity->date_recorded );
+    }
 
 function bp_activity_feed_item_description() {
-    global $activities_template;
-
-    echo apply_filters( 'bp_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $activities_template->activity->content ), ENT_COMPAT, 'UTF-8' ) ); 
-}
-
-
+    echo bp_get_activity_feed_item_description();   
+}
+    function bp_get_activity_feed_item_description() {
+        global $activities_template;
+
+        return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $activities_template->activity->content ), ENT_COMPAT, 'UTF-8' ) );   
+    }
 
 ?>

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -320 +320 @@
 }
 
+function bp_blogs_pagination_count() {
+    global $bp, $blogs_template;
+    
+    $from_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) ;
+
+    echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $blogs_template->total_blog_count ); ?>  
+    <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" /><?php
+}
+
+function bp_blogs_pagination_links() {
+    echo bp_get_blogs_pagination_links();
+}
+    function bp_get_blogs_pagination_links() {
+        global $blogs_template;
+
+        return apply_filters( 'bp_get_blogs_pagination_links', $blogs_template->pag_links );
+    }
+
 function bp_blog_title() {
-    global $blogs_template; 
-    echo apply_filters( 'bp_blog_title', $blogs_template->blog['title'] );
-}
+    echo bp_get_blog_title();
+}
+    function bp_get_blog_title() {
+        global $blogs_template;
+            
+        return apply_filters( 'bp_get_blog_title', $blogs_template->blog['title'] );
+    }
 
 function bp_blog_description() {
-    global $blogs_template;
-    echo apply_filters( 'bp_blog_description', $blogs_template->blog['description'] );
-}
+    echo bp_get_blog_description();
+}
+    function bp_get_blog_description() {
+        global $blogs_template;
+        
+        return apply_filters( 'bp_get_blog_description', $blogs_template->blog['description'] );
+    }
 
 function bp_blog_permalink() {
-    global $blogs_template; 
-    echo apply_filters( 'bp_blog_permalink', $blogs_template->blog['siteurl'] );
-}
-
-function bp_blogs_pagination() {
-    global $blogs_template;
-    echo $blogs_template->pag_links;
-}
+    echo bp_get_blog_permalink();
+}
+    function bp_get_blog_permalink() {
+        global $blogs_template; 
+        
+        return apply_filters( 'bp_get_blog_permalink', $blogs_template->blog['siteurl'] );
+    }
 
 
@@ -470 +496 @@
 }
 
-function bp_post_pagination() {
-    global $posts_template;
-    echo $posts_template->pag_links;
-}
-
-function bp_post_title( $echo = true ) {
-    global $posts_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_post_title', $posts_template->post->post_title );
+function bp_post_pagination_count() {
+    global $bp, $posts_template;
+    
+    $from_num = intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) ;
+
+    echo sprintf( __( 'Viewing post %d to %d (of %d posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?> &nbsp;
+    <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" /><?php
+}
+
+function bp_post_pagination_links() {
+    echo bp_get_post_pagination_links();
+}
+    function bp_get_post_pagination_links() {
+        global $posts_template;
+
+        return apply_filters( 'bp_get_post_pagination_links', $posts_template->pag_links );
+    }
+
+function bp_post_id() {
+    echo bp_get_post_id();
+}
+    function bp_get_post_id() {
+        global $posts_template;
+        echo apply_filters( 'bp_get_post_id', $posts_template->post->ID );  
+    }
+    
+function bp_post_title( $deprecated = true ) {
+    if ( !$deprecated )
+        bp_get_post_title();
     else
-        return apply_filters( 'bp_post_title', $posts_template->post->post_title );
-}
+        echo bp_get_post_title();
+}
+    function bp_get_post_title() {
+        global $posts_template;
+        
+        return apply_filters( 'bp_get_post_title', $posts_template->post->post_title );
+    }
 
 function bp_post_permalink() {
     global $posts_template;
-    echo apply_filters( 'bp_post_permalink', bp_post_get_permalink() ); 
+    
+    echo bp_post_get_permalink();   
 }
 
 function bp_post_excerpt() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_excerpt', $posts_template->post->post_excerpt );   
-}
+    echo bp_get_post_excerpt(); 
+}
+    function bp_get_post_excerpt() {
+        global $posts_template;
+        echo apply_filters( 'bp_get_post_excerpt', $posts_template->post->post_excerpt );   
+    }
 
 function bp_post_content() {
-    global $posts_template;
-    $content = $posts_template->post->post_content;
-    $content = apply_filters('the_content', $content);
-    $content = str_replace(']]>', ']]&gt;', $content);
-    echo apply_filters( 'bp_post_content', $content );
-}
+    echo bp_get_post_content();
+}
+    function bp_get_post_content() {
+        global $posts_template;
+        $content = $posts_template->post->post_content;
+        $content = apply_filters('the_content', $content);
+        $content = str_replace(']]>', ']]&gt;', $content);
+        return apply_filters( 'bp_get_post_content', $content );
+    }
 
 function bp_post_status() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_status', $posts_template->post->post_status ); 
-}
-
-function bp_post_date( $date_format = null, $echo = true ) {
-    global $posts_template;
-    
+    echo bp_get_post_status();
+}
+    function bp_get_post_status() {
+        global $posts_template;
+        return apply_filters( 'bp_get_post_status', $posts_template->post->post_status );   
+    }
+    
+function bp_post_date( $date_format = null, $deprecated = true ) {
     if ( !$date_format )
         $date_format = get_option('date_format');
         
-    if ( $echo )
-        echo apply_filters( 'bp_post_date', mysql2date( $date_format, $posts_template->post->post_date ) );
+    if ( !$deprecated )
+        return bp_get_post_date( $date_format );
     else
-        return apply_filters( 'bp_post_date', mysql2date( $date_format, $posts_template->post->post_date ) );
-}
+        echo bp_get_post_date();
+}
+    function bp_get_post_date( $date_format = null ) {
+        global $posts_template;
+
+        if ( !$date_format )
+            $date_format = get_option('date_format');
+
+        echo apply_filters( 'bp_get_post_date', mysql2date( $date_format, $posts_template->post->post_date ) );
+    }
 
 function bp_post_comment_count() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_comment_count', $posts_template->post->comment_count );    
-}
+    echo bp_get_post_comment_count();
+}
+    function bp_get_post_comment_count() {
+        global $posts_template;
+        return apply_filters( 'bp_get_post_comment_count', $posts_template->post->comment_count );  
+    }
 
 function bp_post_comments( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $css_class = '', $none = 'Comments Off' ) {
@@ -561 +631 @@
 }
 
-function bp_post_author( $echo = true ) {
+function bp_post_author( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_post_author();
+    else
+        echo bp_get_post_author();
+}
+    function bp_get_post_author() {
+        global $posts_template;
+        
+        return apply_filters( 'bp_get_post_author', bp_core_get_userlink( $posts_template->post->post_author ) );
+    }
+
+function bp_post_category( $separator = '', $parents = '', $post_id = false, $deprecated = true ) {
     global $posts_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_post_author', bp_core_get_userlink( $posts_template->post->post_author ) );
+
+    if ( !$deprecated )
+        return bp_get_post_category( $separator, $parents, $post_id );
     else
-        return apply_filters( 'bp_post_author', bp_core_get_userlink( $posts_template->post->post_author ) );
-}
-
-function bp_post_id() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_id', $posts_template->post->ID );  
-}
-
-function bp_post_category( $separator = '', $parents='', $post_id = false, $echo = true ) {
-    global $posts_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_post_category', get_the_category_list( $separator, $parents, $posts_template->post->ID ) );
-    else
-        return apply_filters( 'bp_post_category', get_the_category_list( $separator, $parents, $posts_template->post->ID ) );
-}
+        echo bp_get_post_category();
+}
+    function bp_get_post_category( $separator = '', $parents = '', $post_id = false ) {
+        global $posts_template;
+
+        if ( !$post_id )
+            $post_id = $posts_template->post->ID;
+
+        return apply_filters( 'bp_get_post_category', get_the_category_list( $separator, $parents, $post_id ) );    
+    }
 
 function bp_post_tags( $before = '', $sep = ', ', $after = '' ) {
@@ -593 +669 @@
 
 function bp_post_blog_id() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_blog_id', $posts_template->post->blog_id );
-}
-
-function bp_post_blog_title() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_blog_title', $posts_template->post->blog_id ); 
-}
-
-function bp_post_blog_description() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_blog_description', $posts_template->post->blog_id );   
-}
+    echo bp_get_post_blog_id();
+}
+    function bp_get_post_blog_id() {
+        global $posts_template;
+
+        return apply_filters( 'bp_get_post_blog_id', $posts_template->post->blog_id );
+    }
+
+function bp_post_blog_name() {
+    echo bp_get_post_blog_name();
+}
+    function bp_get_post_blog_name() {
+        global $posts_template;
+        return apply_filters( 'bp_get_post_blog_name', get_blog_option( $posts_template->post->blog_id, 'blogname' ) ); 
+    }
 
 function bp_post_blog_permalink() {
-    global $posts_template;
-    echo apply_filters( 'bp_post_blog_permalink', $posts_template->post->blog_id ); 
-}
-
+    echo bp_get_post_blog_permalink();  
+}
+    function bp_get_post_blog_permalink() {
+        global $posts_template;
+        return apply_filters( 'bp_get_post_blog_permalink', get_blog_option( $posts_template->post->blog_id, 'siteurl' ) ); 
+    }
+    
 function bp_post_get_permalink( $post = null, $blog_id = null ) {
     global $current_blog, $posts_template;
@@ -831 +912 @@
 
 function bp_comments_pagination() {
+    echo bp_get_comments_pagination();
+}
+    function bp_get_comments_pagination() {
+        global $comments_template;
+        
+        return apply_filters( 'bp_get_comments_pagination', $comments_template->pag_links );
+    }
+
+function bp_comment_id() {
+    echo bp_get_comment_id();
+}
+    function bp_get_comment_id() {
+        global $comments_template;
+        echo apply_filters( 'bp_get_comment_id', $comments_template->comment->comment_ID );
+    }
+
+function bp_comment_post_permalink( $depricated = true ) {
+    if ( !$depricated )
+        return bp_get_comment_post_permalink();
+    else
+        echo bp_get_comment_post_permalink();
+}
+    function bp_get_comment_post_permalink() {
+        global $comments_template;
+        
+        return apply_filters( 'bp_get_comment_post_permalink', bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID );
+    }
+
+function bp_comment_post_title( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_comment_post_title();
+    else
+        echo bp_get_comment_post_title();
+}
+    function bp_get_comment_post_title( $deprecated = true ) {
+        global $comments_template;
+        
+        return apply_filters( 'bp_get_comment_post_title', $comments_template->comment->post->post_title );
+    }
+
+function bp_comment_author( $deprecated = true ) {
     global $comments_template;
-    echo $comments_template->pag_links;
-}
-
-function bp_comment_id() {
-    global $comments_template;
-    echo apply_filters( 'bp_comment_id', $comments_template->comment->comment_ID );
-}
-
-function bp_comment_post_permalink( $echo = true ) {
-    global $comments_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_comment_post_permalink', bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID );
+    
+    if ( !$deprecated )
+        return bp_get_comment_author();
     else
-        return apply_filters( 'bp_comment_post_permalink', bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID );
-}
-
-function bp_comment_post_title( $echo = true ) {
-    global $comments_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_comment_post_title', $comments_template->comment->post->post_title );
-    else
-        return apply_filters( 'bp_comment_post_title', $comments_template->comment->post->post_title );
-}
-
-function bp_comment_author( $echo = true ) {
-    global $comments_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_comment_author', bp_core_get_userlink( $comments_template->comment->user_id ) );
-    else
-        return apply_filters( 'bp_comment_author', bp_core_get_userlink( $comments_template->comment->user_id ) );
-}
+        echo bp_get_comment_author();
+}
+    function bp_get_comment_author() {
+        global $comments_template;
+
+        return apply_filters( 'bp_get_comment_author', bp_core_get_userlink( $comments_template->comment->user_id ) );
+    }
 
 function bp_comment_content() {
-    global $comments_template;
-    $content = $comments_template->comment->comment_content;
-    $content = apply_filters('the_content', $content);
-    $content = str_replace(']]>', ']]&gt;', $content);
-    echo apply_filters( 'bp_comment_content', $content );
-}
-
-function bp_comment_date( $date_format = null, $echo = true ) {
-    global $comments_template;
-    
+    echo bp_get_comment_content();
+}
+    function bp_get_comment_content() {
+        global $comments_template;
+        $content = $comments_template->comment->comment_content;
+        $content = apply_filters('the_content', $content);
+        $content = str_replace(']]>', ']]&gt;', $content);
+        echo apply_filters( 'bp_get_comment_content', $content );
+    }
+
+function bp_comment_date( $date_format = null, $deprecated = true ) {
     if ( !$date_format )
         $date_format = get_option('date_format');
         
-    if ( $echo )
-        echo apply_filters( 'bp_comment_date', mysql2date( $date_format, $comments_template->comment->comment_date ) );
+    if ( !$deprecated )
+        return bp_get_comment_date( $date_format );
     else 
-        return apply_filters( 'bp_comment_date', mysql2date( $date_format, $comments_template->comment->comment_date ) );
-}
-
-function bp_comment_blog_permalink( $echo = true ) {
+        echo bp_get_comment_date( $date_format );
+}
+    function bp_get_comment_date( $date_format = null ) {
+        global $comments_template;
+
+        if ( !$date_format )
+            $date_format = get_option('date_format');
+
+        return apply_filters( 'bp_get_comment_date', mysql2date( $date_format, $comments_template->comment->comment_date ) );
+    }
+
+function bp_comment_blog_permalink( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_comment_blog_permalink(); 
+    else
+        echo bp_get_comment_blog_permalink();
+}
+    function bp_get_comment_blog_permalink() {
+        global $comments_template;
+
+        return apply_filters( 'bp_get_comment_blog_permalink', get_blog_option( $comments_template->comment->blog_id, 'siteurl' ) );
+    }
+
+function bp_comment_blog_name( $deprecated = true ) {
     global $comments_template;
     
-    if ( $echo )
-        echo apply_filters( 'bp_comment_blog_permalink', get_blog_option( $comments_template->comment->blog_id, 'siteurl' ) );
+    if ( !$deprecated )
+        return bp_get_comment_blog_permalink(); 
     else
-        return apply_filters( 'bp_comment_blog_permalink', get_blog_option( $comments_template->comment->blog_id, 'siteurl' ) );
-}
-
-function bp_comment_blog_name( $echo = true ) {
-    global $comments_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_comment_blog_name', get_blog_option( $comments_template->comment->blog_id, 'blogname' ) );
-    else
-        return apply_filters( 'bp_comment_blog_name', get_blog_option( $comments_template->comment->blog_id, 'blogname' ) );
-}
+        echo bp_get_comment_blog_permalink();   
+}
+    function bp_get_comment_blog_name( $deprecated = true ) {
+        global $comments_template;
+
+        return apply_filters( 'bp_get_comment_blog_name', get_blog_option( $comments_template->comment->blog_id, 'blogname' ) );
+    }
 
 /**********************************************************************
@@ -1073 +1189 @@
 
 function bp_site_blogs_pagination_links() {
-    global $site_blogs_template;
-    echo $site_blogs_template->pag_links;
-}
-
+    echo bp_get_site_blogs_pagination_links();
+}
+    function bp_get_site_blogs_pagination_links() {
+        global $site_blogs_template;
+
+        return apply_filters( 'bp_get_site_blogs_pagination_links', $site_blogs_template->pag_links );
+    }
+    
 function bp_the_site_blog_avatar() {
-    global $site_blogs_template, $bp;
-
-    /***
-     * In future BuddyPress versions you will be able to set the avatar for a blog.
-     * Right now you can use a filter with the ID of the blog to change it if you wish.
-     */
-    
-    echo apply_filters( 'bp_blogs_blog_avatar_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
-}
+    echo bp_get_the_site_blog_avatar();
+}
+    function bp_get_the_site_blog_avatar() {
+        global $site_blogs_template, $bp;
+        
+        /***
+         * In future BuddyPress versions you will be able to set the avatar for a blog.
+         * Right now you can use a filter with the ID of the blog to change it if you wish.
+         */
+        return apply_filters( 'bp_get_blogs_blog_avatar_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
 
 function bp_the_site_blog_avatar_thumb() {
-    global $site_blogs_template, $bp;
-
-    echo apply_filters( 'bp_blogs_blog_avatar_thumb_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
-}
+    echo bp_get_the_site_blog_avatar_thumb();
+}
+    function bp_get_the_site_blog_avatar_thumb() {
+        global $site_blogs_template, $bp;
+
+        return apply_filters( 'bp_get_blogs_blog_avatar_thumb_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
 
 function bp_the_site_blog_avatar_mini() {
-    global $site_blogs_template, $bp;
-    
-    echo apply_filters( 'bp_blogs_blog_avatar_mini_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
-}
+    echo bp_get_the_site_blog_avatar_mini();
+}
+    function bp_get_the_site_blog_avatar_mini() {
+        global $site_blogs_template, $bp;
+
+        return apply_filters( 'bp_get_blogs_blog_avatar_mini_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
 
 function bp_the_site_blog_link() {
-    global $site_blogs_template;
-    
-    echo get_blog_option( $site_blogs_template->blog->blog_id, 'siteurl' );
-}
+    echo bp_get_the_site_blog_link();
+}
+    function bp_get_the_site_blog_link() {
+        global $site_blogs_template;
+
+        return apply_filters( 'bp_get_the_site_blog_link', get_blog_option( $site_blogs_template->blog->blog_id, 'siteurl' ) );
+    }
 
 function bp_the_site_blog_name() {
-    global $site_blogs_template;
-    
-    echo get_blog_option( $site_blogs_template->blog->blog_id, 'blogname' );
-}
+    echo bp_get_the_site_blog_name();
+}
+    function bp_get_the_site_blog_name() {
+        global $site_blogs_template;
+
+        return apply_filters( 'bp_get_the_site_blog_name', get_blog_option( $site_blogs_template->blog->blog_id, 'blogname' ) );
+    }
 
 function bp_the_site_blog_description() {
-    global $site_blogs_template;
-    
-    echo get_blog_option( $site_blogs_template->blog->blog_id, 'blogdescription' );
-}
+    echo apply_filters( 'bp_the_site_blog_description', bp_get_the_site_blog_description() );
+}
+    function bp_get_the_site_blog_description() {
+        global $site_blogs_template;
+
+        return apply_filters( 'bp_get_the_site_blog_description', get_blog_option( $site_blogs_template->blog->blog_id, 'blogdescription' ) );
+    }
 
 function bp_the_site_blog_last_active() {
-    global $site_blogs_template;
-
-    echo bp_core_get_last_activity( bp_blogs_get_blogmeta( $site_blogs_template->blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
-}
+    echo bp_get_the_site_blog_last_active();
+}
+    function bp_get_the_site_blog_last_active() {
+        global $site_blogs_template;
+
+        return apply_filters( 'bp_the_site_blog_last_active', bp_core_get_last_activity( bp_blogs_get_blogmeta( $site_blogs_template->blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) );
+    }
 
 function bp_the_site_blog_latest_post() {
-    global $site_blogs_template;
-    
-    if ( $post = bp_blogs_get_latest_posts( $site_blogs_template->blog->blog_id, 1 ) ) {
-        printf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $site_blogs_template->blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' );
-    }
-}
-
+    echo bp_get_the_site_blog_latest_post();
+}
+    function bp_get_the_site_blog_latest_post() {
+        global $site_blogs_template;
+
+        if ( $post = bp_blogs_get_latest_posts( $site_blogs_template->blog->blog_id, 1 ) ) {
+            return apply_filters( 'bp_get_the_site_blog_latest_post', sprintf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $site_blogs_template->blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' ) );
+        }
+    }
 
 function bp_the_site_blog_hidden_fields() {

trunk/bp-core.php

@@ -9 +9 @@
 define( 'BP_PLUGIN_URL', WP_PLUGIN_URL . '/buddypress' );
 
-/* Place your custom code (actions/filters) in a file called bp-custom.php and it will be loaded before anything else. */
-if ( file_exists( BP_PLUGIN_DIR . '/bp-custom.php' ) )
-    require( BP_PLUGIN_DIR . '/bp-custom.php' );
+/* Place your custom code (actions/filters) in a file called /plugins/bp-custom.php and it will be loaded before anything else. */
+if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
+    require( WP_PLUGIN_DIR . '/bp-custom.php' );
 
 /* Define on which blog ID BuddyPress should run */

trunk/bp-core/bp-core-classes.php

@@ -245 +245 @@
         like_escape($search_terms); 
 
-        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT DISTINCT count(u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC", $search_terms );
-        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
+        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT DISTINCT count(u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
+        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
 
         $total_users = $wpdb->get_var( $total_users_sql );

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

@@ -239 +239 @@
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( function_exists('xprofile_install') ) {
-            $fullname = bp_core_ucfirst( xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id ) );
+            $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
 
             if ( empty($fullname) || !$fullname ) {
@@ -932 +932 @@
 
 function bp_site_members_pagination_links() {
-    global $site_members_template;
-    echo $site_members_template->pag_links;
-}
+    echo bp_get_site_members_pagination_links();
+}
+    function bp_get_site_members_pagination_links() {
+        global $site_members_template;
+        
+        return apply_filters( 'bp_get_site_members_pagination_links', $site_members_template->pag_links );
+    }
 
 function bp_the_site_member_user_id() { 
-    global $site_members_template; 
-
-    echo $site_members_template->member->id; 
-}
+    echo bp_get_the_site_member_user_id(); 
+}
+    function bp_get_the_site_member_user_id() { 
+        global $site_members_template; 
+
+        return apply_filters( 'bp_get_the_site_member_user_id', $site_members_template->member->id ); 
+    }
 
 function bp_the_site_member_avatar() {
-    global $site_members_template;
-    
-    echo $site_members_template->member->avatar_thumb;
-}
+    echo apply_filters( 'bp_the_site_member_avatar', bp_get_the_site_member_avatar() );
+}
+    function bp_get_the_site_member_avatar() { 
+        global $site_members_template; 
+
+        return apply_filters( 'bp_get_the_site_member_avatar', $site_members_template->member->avatar_thumb );
+    }
 
 function bp_the_site_member_link() {
-    global $site_members_template;
-    
-    echo $site_members_template->member->user_url;
-}
+    echo bp_get_the_site_member_link();
+}
+    function bp_get_the_site_member_link() {
+        global $site_members_template;
+
+        echo apply_filters( 'bp_get_the_site_member_link', $site_members_template->member->user_url );
+    }
 
 function bp_the_site_member_name() {
-    global $site_members_template;
-    
-    echo $site_members_template->member->fullname;
-}
+    echo apply_filters( 'bp_the_site_member_name', bp_get_the_site_member_name() );
+}
+    function bp_get_the_site_member_name() {
+        global $site_members_template;
+
+        return apply_filters( 'bp_get_the_site_member_name', $site_members_template->member->fullname );
+    }
+    add_filter( 'bp_get_the_site_member_name', 'wp_filter_kses' );
 
 function bp_the_site_member_last_active() {
-    global $site_members_template;
-
-    echo $site_members_template->member->last_active;
-}
-
+    echo bp_get_the_site_member_last_active();
+}
+    function bp_get_the_site_member_last_active() {
+        global $site_members_template;
+
+        return apply_filters( 'bp_the_site_member_last_active', $site_members_template->member->last_active );
+    }
+    
 function bp_the_site_member_add_friend_button() {
     global $site_members_template;
@@ -980 +1000 @@
         return false;
     
-    if ( 1 == (int) $site_members_template->member->total_friends )
-        printf( __( '%d friend', 'buddypress' ), (int) $site_members_template->member->total_friends );
-    else
-        printf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends );        
-}
-
+    echo bp_get_the_site_member_total_friend_count();
+}
+    function bp_get_the_site_member_total_friend_count() {
+        global $site_members_template;
+
+        if ( !(int) $site_members_template->member->total_friends )
+            return false;
+
+        if ( 1 == (int) $site_members_template->member->total_friends )
+            return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friend', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
+        else
+            return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends ) );      
+    }
+    
 function bp_the_site_member_random_profile_data() {
     global $site_members_template;
@@ -991 +1019 @@
     if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
         <?php $random_data = xprofile_get_random_profile_data( $site_members_template->member->id, true ); ?>
-            <strong><?php echo $random_data[0]->name ?></strong>
-            <?php echo $random_data[0]->value ?>
+            <strong><?php echo wp_filter_kses( $random_data[0]->name ) ?></strong>
+            <?php echo wp_filter_kses( $random_data[0]->value ) ?>
     <?php }
 }
@@ -1033 +1061 @@
    also means we dont have to use the $bp variable in the template (looks messy) */
 
-function bp_current_user_id() {
-    global $bp;
-    return apply_filters( 'bp_current_user_id', $bp->displayed_user->id );
-}
-    function bp_displayed_user_id() {
-        return bp_current_user_id();
-    }
+function bp_displayed_user_id() {
+    global $bp;
+    return apply_filters( 'bp_displayed_user_id', $bp->displayed_user->id );
+}
+    function bp_current_user_id() { return bp_displayed_user_id(); }
 
 function bp_loggedin_user_id() {

trunk/bp-forums/bp-forums-filters.php

@@ -4 +4 @@
 add_filter( 'bp_forums_new_post_text', 'bp_forums_filter_encode' );
 
-add_filter( 'bp_the_topic_post_content', 'bp_forums_filter_decode' );
-add_filter( 'bp_the_topic_latest_post_excerpt', 'bp_forums_filter_decode' );
+add_filter( 'bp_get_the_topic_post_content', 'bp_forums_filter_decode' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_forums_filter_decode' );
 
-add_filter( 'bp_the_topic_latest_post_excerpt', 'bp_create_excerpt' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_create_excerpt' );
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_the_topic_title', 'wptexturize' );
-add_filter( 'bp_the_topic_poster_name', 'wptexturize' );
-add_filter( 'bp_the_topic_last_poster_name', 'wptexturize' );
-add_filter( 'bp_the_topic_post_content', 'wptexturize' );
-add_filter( 'bp_the_topic_post_poster_name', 'wptexturize' );
+add_filter( 'bp_get_the_topic_title', 'wptexturize' );
+add_filter( 'bp_get_the_topic_poster_name', 'wptexturize' );
+add_filter( 'bp_get_the_topic_last_poster_name', 'wptexturize' );
+add_filter( 'bp_get_the_topic_post_content', 'wptexturize' );
+add_filter( 'bp_get_the_topic_post_poster_name', 'wptexturize' );
 
-add_filter( 'bp_the_topic_title', 'convert_smilies' );
-add_filter( 'bp_the_topic_latest_post_excerpt', 'convert_smilies' );
-add_filter( 'bp_the_topic_post_content', 'convert_smilies' );
+add_filter( 'bp_get_the_topic_title', 'convert_smilies' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'convert_smilies' );
+add_filter( 'bp_get_the_topic_post_content', 'convert_smilies' );
 
-add_filter( 'bp_the_topic_title', 'convert_chars' );
-add_filter( 'bp_the_topic_latest_post_excerpt', 'convert_chars' );
-add_filter( 'bp_the_topic_post_content', 'convert_chars' );
+add_filter( 'bp_get_the_topic_title', 'convert_chars' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'convert_chars' );
+add_filter( 'bp_get_the_topic_post_content', 'convert_chars' );
 
-add_filter( 'bp_the_topic_post_content', 'wpautop' );
-add_filter( 'bp_the_topic_latest_post_excerpt', 'wpautop' );
+add_filter( 'bp_get_the_topic_post_content', 'wpautop' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'wpautop' );
 
-add_filter( 'bp_the_topic_post_content', 'stripslashes_deep' );
-add_filter( 'bp_the_topic_title', 'stripslashes_deep' );
-add_filter( 'bp_the_topic_latest_post_excerpt', 'stripslashes_deep' );
+add_filter( 'bp_get_the_topic_post_content', 'stripslashes_deep' );
+add_filter( 'bp_get_the_topic_title', 'stripslashes_deep' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'stripslashes_deep' );
 
-add_filter( 'bp_the_topic_post_content', 'make_clickable' );
+add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
 
 function bp_forums_add_allowed_tags( $allowedtags ) {

trunk/bp-forums/bp-forums-templatetags.php

@@ -118 +118 @@
 
 function bp_the_topic_id() {
+    echo bp_get_the_topic_id();
+}
+    function bp_get_the_topic_id() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_id', $forum_template->topic->topic_id );
+    }
+    
+function bp_the_topic_title() {
+    echo bp_get_the_topic_title();
+}
+    function bp_get_the_topic_title() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_title', stripslashes( $forum_template->topic->topic_title ) );
+    }
+
+function bp_the_topic_slug() {
+    echo bp_get_the_topic_slug();
+}
+    function bp_get_the_topic_slug() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_slug', $forum_template->topic->topic_slug );
+    }
+
+function bp_the_topic_poster_id() {
+    echo bp_get_the_topic_poster_id();
+}
+    function bp_get_the_topic_poster_id() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_poster_id', $forum_template->topic->topic_poster );
+    }
+
+function bp_the_topic_poster_avatar() {
+    echo bp_get_the_topic_poster_avatar();
+}
+    function bp_get_the_topic_poster_avatar() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_poster, 1 ) ); 
+    }
+
+function bp_the_topic_poster_name() {
+    echo bp_get_the_topic_poster_name();
+}
+    function bp_get_the_topic_poster_name() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_poster_name', bp_core_get_userlink( $forum_template->topic->topic_poster ) );
+    }
+    
+function bp_the_topic_last_poster_name() {
+    echo bp_get_the_topic_last_poster_name();
+}
+    function bp_get_the_topic_last_poster_name() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_last_poster_name', bp_core_get_userlink( $forum_template->topic->topic_last_poster ) );
+    }
+
+function bp_the_topic_last_poster_avatar() {
+    echo bp_get_the_topic_last_poster_avatar();
+}
+    function bp_get_the_topic_last_poster_avatar() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_last_poster, 1 ) ); 
+    }
+
+function bp_the_topic_start_time() {
+    echo bp_get_the_topic_start_time();
+}
+    function bp_get_the_topic_start_time() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_start_time', $forum_template->topic->topic_start_time );
+    }
+    
+function bp_the_topic_time() {
+    echo bp_get_the_topic_time();
+}
+    function bp_get_the_topic_time() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_time', $forum_template->topic->topic_time );
+    }
+
+function bp_the_topic_forum_id() {
+    echo bp_get_the_topic_forum_id();
+}
+    function bp_get_the_topic_forum_id() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_forum_id', $forum_template->topic->topic_forum_id );
+    }
+
+function bp_the_topic_status() {
+    echo bp_get_the_topic_status();
+}
+    function bp_get_the_topic_status() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_status', $forum_template->topic->topic_status );
+    }
+
+function bp_the_topic_is_topic_open() {
+    echo bp_get_the_topic_is_topic_open();
+}
+    function bp_get_the_topic_is_topic_open() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_is_topic_open', $forum_template->topic->topic_open );
+    }
+
+function bp_the_topic_last_post_id() {
+    echo bp_get_the_topic_last_post_id();
+}
+    function bp_get_the_topic_last_post_id() {
+        global $forum_template;
+
+        echo apply_filters( 'bp_get_the_topic_last_post_id', $forum_template->topic->topic_last_post_id );
+    }
+
+function bp_the_topic_is_sticky() {
+    echo bp_get_the_topic_is_sticky();
+}
+    function bp_get_the_topic_is_sticky() {
+        global $forum_template;
+
+        echo apply_filters( 'bp_get_the_topic_is_sticky', $forum_template->topic->topic_sticky );
+    }
+
+function bp_the_topic_total_post_count() {
+    echo bp_get_the_topic_total_post_count();
+}
+    function bp_get_the_topic_total_post_count() {
+        global $forum_template;
+
+        if ( $forum_template->topic->topic_posts == 1 )
+            return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d post', 'buddypress' ), $forum_template->topic->topic_posts ) );
+        else
+            return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );        
+    }
+
+function bp_the_topic_tag_count() {
+    echo bp_get_the_topic_tag_count();
+}
+    function bp_get_the_topic_tag_count() {
+        global $forum_template;
+
+        echo apply_filters( 'bp_get_the_topic_tag_count', $forum_template->topic->tag_count );
+    }
+
+function bp_the_topic_permalink() {
+    echo bp_get_the_topic_permalink();
+}
+    function bp_get_the_topic_permalink() {
+        global $forum_template, $bbpress_live, $group_obj;
+
+        $target_uri = $bbpress_live->fetch->options['target_uri'];
+
+        return apply_filters( 'bp_get_the_topic_permalink', bp_get_group_permalink( $group_obj ) . '/forum/topic/' . $forum_template->topic->topic_id );
+    }
+
+function bp_the_topic_time_since_created() {
+    echo bp_get_the_topic_time_since_created();
+}
+    function bp_get_the_topic_time_since_created() {
+        global $forum_template;
+
+        echo apply_filters( 'bp_get_the_topic_time_since_created', $forum_template->topic->topic_start_time_since );
+    }
+    
+function bp_the_topic_latest_post_excerpt() {
+    echo bp_get_the_topic_latest_post_excerpt();
+}
+    function bp_get_the_topic_latest_post_excerpt() {
+        global $forum_template;
+
+        $post = bp_forums_get_post( $forum_template->topic->topic_last_post_id );
+        return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post->post_text );
+    }
+
+function bp_the_topic_time_since_last_post( $deprecated = true ) {
     global $forum_template;
     
-    echo apply_filters( 'bp_the_topic_id', $forum_template->topic->topic_id );
-}
-
-function bp_the_topic_title() {
-    global $forum_template;
-
-    echo apply_filters( 'bp_the_topic_title', stripslashes( $forum_template->topic->topic_title ) );
-}
-
-function bp_the_topic_slug() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_slug', $forum_template->topic->topic_slug );
-}
-
-function bp_the_topic_poster_id() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_poster_id', $forum_template->topic->topic_poster );
-}
-
-function bp_the_topic_poster_avatar() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_poster, 1 ) ); 
-}
-
-function bp_the_topic_poster_name() {
-    global $forum_template;
-        
-    echo apply_filters( 'bp_the_topic_poster_name', bp_core_get_userlink( $forum_template->topic->topic_poster ) );
-}
-
-function bp_the_topic_last_poster_name() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_last_poster_name', bp_core_get_userlink( $forum_template->topic->topic_last_poster ) );
-}
-
-function bp_the_topic_last_poster_avatar() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_last_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_last_poster, 1 ) ); 
-}
-
-function bp_the_topic_start_time() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_start_time', $forum_template->topic->topic_start_time );
-}
-
-function bp_the_topic_time() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_time', $forum_template->topic->topic_time );
-}
-
-function bp_the_topic_forum_id() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_forum_id', $forum_template->topic->topic_forum_id );
-}
-
-function bp_the_topic_status() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_status', $forum_template->topic->topic_status );
-}
-
-function bp_the_topic_is_topic_open() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_is_topic_open', $forum_template->topic->topic_open );
-}
-
-function bp_the_topic_last_post_id() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_last_post_id', $forum_template->topic->topic_last_post_id );
-}
-
-function bp_the_topic_is_sticky() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_is_sticky', $forum_template->topic->topic_sticky );
-}
-
-function bp_the_topic_total_post_count() {
-    global $forum_template;
-    
-    if ( $forum_template->topic->topic_posts == 1 )
-        echo apply_filters( 'bp_the_topic_total_post_count', sprintf( __( '%d post', 'buddypress' ), $forum_template->topic->topic_posts ) );
+    if ( !$deprecated )
+        return bp_get_the_topic_time_since_last_post();
     else
-        echo apply_filters( 'bp_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );      
-}
-
-function bp_the_topic_tag_count() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_tag_count', $forum_template->topic->tag_count );
-}
-
-function bp_the_topic_permalink() {
-    global $forum_template, $bbpress_live, $group_obj;
-    
-    $target_uri = $bbpress_live->fetch->options['target_uri'];
-    
-    echo apply_filters( 'bp_the_topic_permalink', bp_group_permalink( $group_obj, false ) . '/forum/topic/' . $forum_template->topic->topic_id );
-}
-
-function bp_the_topic_time_since_created() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_the_topic_time_since_created', $forum_template->topic->topic_start_time_since );
-}
-
-function bp_the_topic_latest_post_excerpt() {
-    global $forum_template;
-    
-    $post = bp_forums_get_post( $forum_template->topic->topic_last_post_id );
-    echo apply_filters( 'bp_the_topic_latest_post_excerpt', $post->post_text );
-}
-
-function bp_the_topic_time_since_last_post( $echo = false ) {
-    global $forum_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_the_topic_time_since_last_post', $forum_template->topic->topic_time_since );
-    else
-        return apply_filters( 'bp_the_topic_time_since_last_post', $forum_template->topic->topic_time_since );
-}
+        echo bp_get_the_topic_time_since_last_post();
+}
+    function bp_get_the_topic_time_since_last_post() {
+        global $forum_template;
+
+        return apply_filters( 'bp_get_the_topic_time_since_last_post', $forum_template->topic->topic_time_since );
+    }
 
 function bp_forum_pagination() {
-    global $forum_template;
-    
-    echo apply_filters( 'bp_forum_pagination', $forum_template->pag_links );
-}
+    echo bp_get_forum_pagination();
+}
+    function bp_get_forum_pagination() {
+        global $forum_template;
+
+        echo apply_filters( 'bp_get_forum_pagination', $forum_template->pag_links );
+    }
 
 function bp_forum_pagination_count() {
@@ -393 +461 @@
 
 function bp_the_topic_post_id() {
-    global $topic_template;
-    echo apply_filters( 'bp_the_topic_post_id', $topic_template->post->post_id );
-}
+    echo bp_get_the_topic_post_id();
+}
+    function bp_get_the_topic_post_id() {
+        global $topic_template;
+        
+        return apply_filters( 'bp_get_the_topic_post_id', $topic_template->post->post_id );
+    }
 
 function bp_the_topic_post_content() {
-    global $topic_template;
-
-    echo apply_filters( 'bp_the_topic_post_content', stripslashes( $topic_template->post->post_text ) );
-}
+    echo bp_get_the_topic_post_content();
+}
+    function bp_get_the_topic_post_content() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_the_topic_post_content', stripslashes( $topic_template->post->post_text ) );
+    }
 
 function bp_the_topic_post_poster_avatar() {
-    global $topic_template;
-
-    echo apply_filters( 'bp_the_topic_post_poster_avatar', bp_core_get_avatar( $topic_template->post->poster_id, 1, 20, 20 ) ); 
-}
-
-function bp_the_topic_post_poster_name( $echo = true ) {
-    global $topic_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );
+    echo bp_the_topic_post_poster_avatar();
+}
+    function bp_get_the_topic_post_poster_avatar() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_get_avatar( $topic_template->post->poster_id, 1, 20, 20 ) ); 
+    }
+
+function bp_the_topic_post_poster_name( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_the_topic_post_poster_name();
     else
-        return apply_filters( 'bp_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );
-}
-
-function bp_the_topic_post_time_since( $echo = true ) {
-    global $topic_template;
-
-    if ( $echo )
-        echo apply_filters( 'bp_the_topic_post_time_since', $topic_template->post->post_time_since );
+        echo bp_get_the_topic_post_poster_name();
+}
+    function bp_get_the_topic_post_poster_name() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );      
+    }
+
+function bp_the_topic_post_time_since( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_the_topic_post_time_since();
     else
-        return apply_filters( 'bp_the_topic_post_time_since', $topic_template->post->post_time_since );
-}
+        echo bp_get_the_topic_post_time_since();
+}
+    function bp_get_the_topic_post_time_since() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_the_topic_post_time_since', $topic_template->post->post_time_since );
+    }
 
 function bp_the_topic_pagination() {
-    global $topic_template;
-    
-    echo apply_filters( 'bp_the_topic_pagination', $topic_template->pag_links );
-}
+    echo bp_get_the_topic_pagination();
+}
+    function bp_get_the_topic_pagination() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_the_topic_pagination', $topic_template->pag_links );
+    }
 
 function bp_the_topic_pagination_count() {
@@ -446 +533 @@
 
 function bp_forum_permalink() {
-    global $group_obj;
-    
-    echo apply_filters( 'bp_forum_permalink', bp_group_permalink( $group_obj, false ) . '/forum' );
-}
+    echo bp_get_forum_permalink();
+}
+    function bp_get_forum_permalink() {
+        global $group_obj;
+
+        return apply_filters( 'bp_get_forum_permalink', bp_get_group_permalink( $group_obj ) . '/forum' );
+    }
 
 function bp_forum_action() {
-    global $topic_template;
-    
-    echo apply_filters( 'bp_forum_action', bp_group_permalink( $group_obj, false ) . '/forum' );    
-}
+    echo bp_get_forum_action();
+}
+    function bp_get_forum_action() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_forum_action', bp_get_group_permalink( $group_obj ) . '/forum' ); 
+    }
 
 function bp_forum_topic_action() {
-    global $topic_template;
-
-    
-    echo apply_filters( 'bp_forum_topic_action', bp_group_permalink( $group_obj, false ) . '/forum/topic/' . $topic_template->topic_id );   
-}
+    echo bp_get_forum_topic_action();
+}
+    function bp_get_forum_topic_action() {
+        global $topic_template;
+
+        return apply_filters( 'bp_get_forum_topic_action', bp_get_group_permalink( $group_obj ) . '/forum/topic/' . $topic_template->topic_id );    
+    }
 
 ?>

trunk/bp-friends.php

@@ -12 +12 @@
 require ( 'bp-friends/bp-friends-cssjs.php' );
 require ( 'bp-friends/bp-friends-templatetags.php' );
-require ( 'bp-friends/bp-friends-filters.php' );
 
 /**************************************************************************

trunk/bp-friends/bp-friends-templatetags.php

@@ -182 +182 @@
 }
 
-function bp_friend_avatar_thumb( $template = false ) {
-    global $friends_template;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-    
-    echo apply_filters( 'bp_friend_avatar_thumb', $template->avatar_thumb );
-}
-
-function bp_friend_status( $template = false ) {
-    global $friends_template;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-    
-    if ( $template->status )
-        echo apply_filters( 'bp_friend_status', $template->status );
-}
-
-function bp_friend_name( $template = false ) {
-    global $friends_template;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-    
-    echo apply_filters( 'bp_friend_name', strip_tags( $template->user_link ) ); 
-}
-    
-function bp_friend_link( $template = false ) {
-    global $friends_template;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-    
-    echo apply_filters( 'bp_friend_link', $template->user_link );
-}
-
-function bp_friend_url( $template = false ) {
-    global $friends_template;
-
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-
-    echo apply_filters( 'bp_friend_url', $template->user_url );
-}
-
-function bp_friend_last_active( $time = false, $template = false ) {
-    global $friends_template;
-    
-    if ( !$time )
-        $time = $friends_template->friendship->friend->last_active;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-
-    echo apply_filters( 'bp_friend_last_active', $time );
-}
-
-function bp_friend_last_profile_update( $template = false ) {
-    global $friends_template;
-
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-
-    echo apply_filters( 'bp_friend_last_profile_update', $template->profile_last_updated );
-}
-
-function bp_friend_last_status_update( $template = false ) {
-    global $friends_template;
-
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-
-    echo apply_filters( 'bp_friend_last_status_update', $template->profile_last_updated );
-}
-
-
-function bp_friend_last_content_update( $template = false ) {
-    global $friends_template;
-    
-    if ( !$template )
-        $template = &$friends_template->friendship->friend;
-
-    echo apply_filters( 'bp_friend_last_content_update', $template->content_last_updated );
-}
-
+function bp_friend_avatar_thumb() {
+    echo bp_get_friend_avatar_thumb();
+}
+    function bp_get_friend_avatar_thumb() {
+        global $friends_template;
+
+        if ( !$template )
+            $template = &$friends_template->friendship->friend;
+
+        return apply_filters( 'bp_get_friend_avatar_thumb', $friends_template->friendship->friend->avatar_thumb );
+    }
+
+function bp_friend_status() {
+    echo bp_get_friend_status();
+}
+    function bp_get_friend_status() {
+        global $friends_template;
+
+        if ( $friends_template->friendship->friend->status )
+            return apply_filters( 'bp_get_friend_status', $friends_template->friendship->friend->status );
+        
+        return false;
+    }
+
+function bp_friend_name() {
+    echo bp_get_friend_name();
+}
+    function bp_get_friend_name() {
+        global $friends_template;
+        
+        return apply_filters( 'bp_get_friend_name', strip_tags( $friends_template->friendship->friend->user_link ) );   
+    }
+    
+function bp_friend_link() {
+    echo bp_get_friend_link();
+}
+    function bp_get_friend_link() {
+        global $friends_template;
+
+        return apply_filters( 'bp_get_friend_link', $friends_template->friendship->friend->user_link );
+    }
+
+function bp_friend_url() {
+    echo bp_get_friend_url();
+}
+    function bp_get_friend_url() {
+        global $friends_template;
+
+        return apply_filters( 'bp_get_friend_url', $friends_template->friendship->friend->user_url );
+    }
+
+function bp_friend_last_active() {
+    echo bp_get_friend_last_active();
+}
+    function bp_get_friend_last_active() {
+        global $friends_template;
+
+        return apply_filters( 'bp_get_friend_last_active', $friends_template->friendship->friend->last_active );
+    }
+
+function bp_friend_last_profile_update() {
+    echo bp_get_friend_last_profile_update();
+}
+    function bp_get_friend_last_profile_update() {
+        global $friends_template;
+
+        return apply_filters( 'bp_get_friend_last_profile_update', $friends_template->friendship->friend->profile_last_updated );
+    }
+
+function bp_friend_last_status_update() {
+    echo bp_get_friend_last_status_update();
+}
+    function bp_get_friend_last_status_update() {
+        global $friends_template;
+
+        echo apply_filters( 'bp_get_friend_last_status_update', $friends_template->friendship->friend->profile_last_updated );
+    }
+
+function bp_friend_last_content_update() {
+    echo bp_get_friend_last_content_update();
+}
+    function bp_get_friend_last_content_update() {
+        global $friends_template;
+
+        echo apply_filters( 'bp_get_friend_last_content_update', $friends_template->friendship->friend->content_last_updated );
+    }
+    
 function bp_friend_time_since_requested() {
-    global $friends_template;
-    
-    if ( $friends_template->friendship->date_created != "0000-00-00 00:00:00" ) {
-        echo apply_filters( 'bp_friend_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) ) );
-    }
-}
+    echo bp_get_friend_time_since_requested();
+}
+    function bp_get_friend_time_since_requested() {
+        global $friends_template;
+
+        if ( $friends_template->friendship->date_created != "0000-00-00 00:00:00" ) {
+            return apply_filters( 'bp_friend_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) ) );
+        }
+        
+        return false;
+    }
 
 function bp_friend_accept_request_link() {
-    global $friends_template, $bp;
-    
-    echo apply_filters( 'bp_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friends_template->friendship->id, 'friends_accept_friendship' ) );
-}
+    echo bp_get_friend_accept_request_link();
+}
+    function bp_get_friend_accept_request_link() {
+        global $friends_template, $bp;
+
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friends_template->friendship->id, 'friends_accept_friendship' ) );
+    }
 
 function bp_friend_reject_request_link() {
-    global $friends_template, $bp;
-    
-    echo apply_filters( 'bp_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id, 'friends_reject_friendship' ) );  
-}
+    echo bp_get_friend_reject_request_link();
+}
+    function bp_get_friend_reject_request_link() {
+        global $friends_template, $bp;
+
+        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id, 'friends_reject_friendship' ) );    
+    }
 
 function bp_friend_pagination() {
-    global $friends_template;
-    echo apply_filters( 'bp_friend_pagination', $friends_template->pag_links );
-}
+    echo bp_get_friend_pagination();
+}
+    function bp_get_friend_pagination() {
+        global $friends_template;
+        
+        return apply_filters( 'bp_friend_pagination', $friends_template->pag_links );
+    }
+    
 
 function bp_friend_search_form() {

trunk/bp-groups.php

@@ -387 +387 @@
         
         if ( $completed_to_step == 4 )
-            bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+            bp_core_redirect( bp_get_group_permalink( $group_obj ) );
     }
 
@@ -427 +427 @@
             if ( isset( $_POST['submit_reply'] ) && function_exists( 'bp_forums_new_post') ) {
                 groups_new_group_forum_post( $_POST['reply_text'], $topic_id );
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/forum/topic/' . $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) . '/forum/topic/' . $topic_id );
             }
             
@@ -439 +439 @@
             if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
                 groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id );
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/forum/' );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) . '/forum/' );
             }
             
@@ -466 +466 @@
 
             if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) );
             } else {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp->wire->slug );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) . '/' . $bp->wire->slug );
             }
     
@@ -481 +481 @@
             
             if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) );
             } else {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp->wire->slug );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) . '/' . $bp->wire->slug );
             }
         
@@ -528 +528 @@
             do_action( 'groups_screen_group_invite', $group_obj->id );
 
-            bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+            bp_core_redirect( bp_get_group_permalink( $group_obj ) );
         } else {
             // Show send invite page
@@ -546 +546 @@
             if ( groups_is_group_admin( $bp->loggedin_user->id, $group_obj->id ) ) {
                 bp_core_add_message(  __('As the only group administrator, you cannot leave this group.', 'buddypress'), 'error' );
-                bp_core_redirect( bp_group_permalink( $group_obj, false) );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) );
             }
             
@@ -552 +552 @@
             if ( !groups_leave_group( $group_obj->id ) ) {
                 bp_core_add_message(  __('There was an error leaving the group. Please try again.', 'buddypress'), 'error' );
-                bp_core_redirect( bp_group_permalink( $group_obj, false) );
+                bp_core_redirect( bp_get_group_permalink( $group_obj ) );
             } else {
                 bp_core_add_message( __('You left the group successfully.', 'buddypress') );
@@ -560 +560 @@
         } else if ( isset($bp->action_variables) && 'no' == $bp->action_variables[0] ) {
             
-            bp_core_redirect( bp_group_permalink( $group_obj, false) );
+            bp_core_redirect( bp_get_group_permalink( $group_obj ) );
         
         } else {
@@ -587 +587 @@
                 bp_core_add_message( __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' ) );
             }
-            bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+            bp_core_redirect( bp_get_group_permalink( $group_obj ) );
         }
         
@@ -935 +935 @@
             bp_core_add_message( __('You joined the group!', 'buddypress') );
         }
-        bp_core_redirect( bp_group_permalink( $group_obj, false ) );
+        bp_core_redirect( bp_get_group_permalink( $group_obj ) );
     }
 
@@ -995 +995 @@
                 
             $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_group_permalink( $group, false );
+            $group_link = bp_get_group_permalink( $group );
             
             return array( 
@@ -1009 +1009 @@
             
             $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_group_permalink( $group, false );
+            $group_link = bp_get_group_permalink( $group );
             
             return array( 
@@ -1024 +1024 @@
 
             $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_group_permalink( $group, false );
+            $group_link = bp_get_group_permalink( $group );
             $post_excerpt = bp_create_excerpt( $wire_post->content );
                     
@@ -1047 +1047 @@
 
                 $user_link = bp_core_get_userlink($user_id);
-                $group_link = bp_group_permalink( $group, false );
+                $group_link = bp_get_group_permalink( $group );
 
                 $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
@@ -1072 +1072 @@
                     
                 $user_link = bp_core_get_userlink($user_id);
-                $group_link = bp_group_permalink( $group, false );
+                $group_link = bp_get_group_permalink( $group );
                 
                 $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
@@ -1104 +1104 @@
             $group = new BP_Groups_Group( $group_id, false, false );
             
-            $group_link = bp_group_permalink( $group, false );
+            $group_link = bp_get_group_permalink( $group );
             
             if ( (int)$total_items > 1 ) {
@@ -1118 +1118 @@
             
             $group = new BP_Groups_Group( $group_id, false, false );
-            $group_link = bp_group_permalink( $group, false )  . '/?new';
+            $group_link = bp_get_group_permalink( $group )  . '/?new';
             
             if ( (int)$total_items > 1 ) {
@@ -1131 +1131 @@
             
             $group = new BP_Groups_Group( $group_id, false, false );
-            $group_link = bp_group_permalink( $group, false )  . '/?new';
+            $group_link = bp_get_group_permalink( $group )  . '/?new';
             
             if ( (int)$total_items > 1 ) {
@@ -1145 +1145 @@
         
             $group = new BP_Groups_Group( $group_id, false, false );
-            $group_link = bp_group_permalink( $group, false )  . '/?new';
+            $group_link = bp_get_group_permalink( $group )  . '/?new';
             
             if ( (int)$total_items > 1 ) {
@@ -1158 +1158 @@
     
             $group = new BP_Groups_Group( $group_id, false, false );
-            $group_link = bp_group_permalink( $group, false )  . '/?new';
+            $group_link = bp_get_group_permalink( $group )  . '/?new';
             
             if ( (int)$total_items > 1 ) {

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

@@ -93 +93 @@
 
                 <div class="item">
-                    <div class="item-title"><a href="<?php echo bp_group_permalink( $group, true ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
+                    <div class="item-title"><a href="<?php echo bp_get_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
                     <div class="item-meta">
                         <span class="activity">
@@ -238 +238 @@
                 _e( 'Error joining group', 'buddypress' );
             } else {
-                echo '<a id="group-' . $group->id . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . $group->id . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
             }   
                     
@@ -248 +248 @@
                 _e( 'Error requesting membership', 'buddypress' );  
             } else {
-                echo '<a id="group-' . $group->id . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_group_permalink( $group, false ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';               
+                echo '<a id="group-' . $group->id . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';              
             }       
         }
@@ -260 +260 @@
         } else {
             if ( 'public' == $group->status ) {
-                echo '<a id="group-' . $group->id . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';              
+                echo '<a id="group-' . $group->id . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';             
             } else if ( 'private' == $group->status ) {
-                echo '<a id="group-' . $group->id . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . $group->id . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
             }
         }

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

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_group_description', 'wptexturize' );
-add_filter( 'bp_group_description_excerpt', 'wptexturize' );
-add_filter( 'bp_group_news', 'wptexturize' );
-add_filter( 'bp_group_name', 'wptexturize' );
+add_filter( 'bp_get_group_description', 'wptexturize' );
+add_filter( 'bp_get_group_description_excerpt', 'wptexturize' );
+add_filter( 'bp_get_the_site_group_description', 'wptexturize' );
+add_filter( 'bp_get_the_site_group_description_excerpt', 'wptexturize' );
+add_filter( 'bp_get_group_news', 'wptexturize' );
+add_filter( 'bp_get_group_name', 'wptexturize' );
+add_filter( 'bp_get_the_site_group_name', 'wptexturize' );
 
-add_filter( 'bp_group_description', 'convert_smilies' );
-add_filter( 'bp_group_description_excerpt', 'convert_smilies' );
-add_filter( 'bp_group_news', 'convert_smilies' );
+add_filter( 'bp_get_group_description', 'convert_smilies' );
+add_filter( 'bp_get_group_description_excerpt', 'convert_smilies' );
+add_filter( 'bp_get_group_news', 'convert_smilies' );
+add_filter( 'bp_get_the_site_group_description', 'convert_smilies' );
+add_filter( 'bp_get_the_site_group_description_excerpt', 'convert_smilies' );
 
-add_filter( 'bp_group_description', 'convert_chars' );
-add_filter( 'bp_group_description_excerpt', 'convert_chars' );
-add_filter( 'bp_group_news', 'convert_chars' );
-add_filter( 'bp_group_name', 'convert_chars' );
+add_filter( 'bp_get_group_description', 'convert_chars' );
+add_filter( 'bp_get_group_description_excerpt', 'convert_chars' );
+add_filter( 'bp_get_group_news', 'convert_chars' );
+add_filter( 'bp_get_group_name', 'convert_chars' );
+add_filter( 'bp_get_the_site_group_name', 'convert_chars' );
+add_filter( 'bp_get_the_site_group_description', 'convert_chars' );
+add_filter( 'bp_get_the_site_group_description_excerpt', 'convert_chars' );
 
-add_filter( 'bp_group_description', 'wpautop' );
-add_filter( 'bp_group_news', 'wpautop' );
+add_filter( 'bp_get_group_description', 'wpautop' );
+add_filter( 'bp_get_group_description_excerpt', 'wpautop' );
+add_filter( 'bp_get_group_news', 'wpautop' );
+add_filter( 'bp_get_the_site_group_description', 'wpautop' );
+add_filter( 'bp_get_the_site_group_description_excerpt', 'wpautop' );
 
-add_filter( 'bp_group_description', 'make_clickable' );
-add_filter( 'bp_group_description_excerpt', 'make_clickable' );
-add_filter( 'bp_group_news', 'make_clickable' );
+add_filter( 'bp_get_group_description', 'make_clickable' );
+add_filter( 'bp_get_group_description_excerpt', 'make_clickable' );
+add_filter( 'bp_get_group_news', 'make_clickable' );
 
-add_filter( 'bp_group_description', 'wp_filter_kses', 1 );
-add_filter( 'bp_group_description_excerpt', 'wp_filter_kses', 1 );
-add_filter( 'bp_group_news', 'wp_filter_kses', 1 );
-add_filter( 'bp_group_name', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_name', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_description', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_description_excerpt', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_news', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_site_group_name', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_site_group_description', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_site_group_description_excerpt', 'wp_filter_kses', 1 );
 add_filter( 'groups_details_name_pre_save', 'wp_filter_kses', 1 );
 add_filter( 'groups_details_description_pre_save', 'wp_filter_kses', 1 );
 add_filter( 'groups_details_news_pre_save', 'wp_filter_kses', 1 );
 
-add_filter( 'bp_group_description', 'stripslashes' );
-add_filter( 'bp_group_description_excerpt', 'stripslashes' );
-add_filter( 'bp_group_news', 'stripslashes' );
-add_filter( 'bp_group_name', 'stripslashes' );
+add_filter( 'bp_get_group_description', 'stripslashes' );
+add_filter( 'bp_get_group_description_excerpt', 'stripslashes' );
+add_filter( 'bp_get_group_news', 'stripslashes' );
+add_filter( 'bp_get_group_name', 'stripslashes' );
 
 add_filter( 'groups_new_group_forum_desc', 'bp_create_excerpt' );

trunk/bp-groups/bp-groups-notifications.php

@@ -101 +101 @@
     $requesting_ud = get_userdata($requesting_user_id);
 
-    $group_request_accept = wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/membership-requests/accept/' . $membership_id, 'groups_accept_membership_request' );
-    $group_request_reject = wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/membership-requests/reject/' . $membership_id, 'groups_reject_membership_request' );
+    $group_request_accept = wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/membership-requests/accept/' . $membership_id, 'groups_accept_membership_request' );
+    $group_request_reject = wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/membership-requests/reject/' . $membership_id, 'groups_reject_membership_request' );
     $profile_link = site_url() . '/' . BP_MEMBERS_SLUG . '/' . $requesting_ud->user_login . '/profile';
     $settings_link = site_url() . '/' . BP_MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
@@ -146 +146 @@
     $ud = get_userdata($requesting_user_id);
 
-    $group_link = bp_group_permalink( $group, false );
+    $group_link = bp_get_group_permalink( $group );
     $settings_link = site_url() . '/' . BP_MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
 
@@ -199 +199 @@
     $ud = get_userdata($user_id);
 
-    $group_link = bp_group_permalink( $group, false );
+    $group_link = bp_get_group_permalink( $group );
     $settings_link = site_url() . '/' . BP_MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
 
@@ -229 +229 @@
     $inviter_link = site_url() . '/' . BP_MEMBERS_SLUG . '/' . $inviter_ud->user_login;
     
-    $group_link = bp_group_permalink( $group, false );
+    $group_link = bp_get_group_permalink( $group );
     
     if ( !$member->invite_sent ) {

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

@@ -29 +29 @@
     global $create_group_step;
     
-    switch( $create_group_step ) {
-        case '1':
+    switch( (int) $create_group_step ) {
+        case 1:
             echo '<span>&mdash; ' . __('Group Details', 'buddypress') . '</span>';
         break;
         
-        case '2':
+        case 2:
             echo '<span>&mdash; ' . __('Group Settings', 'buddypress') . '</span>';     
         break;
         
-        case '3':
+        case 3:
             echo '<span>&mdash; ' . __('Group Avatar', 'buddypress') . '</span>';
         break;
         
-        case '4':
+        case 4:
             echo '<span>&mdash; ' . __('Invite Members', 'buddypress') . '</span>';
         break;
@@ -54 +54 @@
 ?>
     <form action="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/<?php echo $create_group_step ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
-    <?php switch( $create_group_step ) {
-        case '1': ?>
+    <?php switch( (int) $create_group_step ) {
+        case 1: ?>
             <label for="group-name">* <?php _e('Group Name', 'buddypress') ?></label>
             <input type="text" name="group-name" id="group-name" value="<?php echo ( $group_obj ) ? $group_obj->name : $_POST['group-name']; ?>" />
@@ -72 +72 @@
         <?php break; ?>
         
-        <?php case '2': ?>
+        <?php case 2: ?>
             <?php if ( $completed_to_step > 0 ) { ?>
                 <?php if ( function_exists('bp_wire_install') ) : ?>
@@ -147 +147 @@
         <?php break; ?>
         
-        <?php case '3': ?>
+        <?php case 3: ?>
             <?php if ( $completed_to_step > 1 ) { ?>
                 <div class="left-menu">
@@ -176 +176 @@
             <?php } ?>
         <?php break; ?>
-        <?php case '4': ?>
+        <?php case 4: ?>
             <?php 
             if ( $completed_to_step > 2 ) {
-                $group_link = bp_group_permalink( $group_obj, false );
+                $group_link = bp_get_group_permalink( $group_obj );
                 
                 if ( function_exists('friends_install') ) {
@@ -307 +307 @@
             <li>
                 <div class="item-avatar">
-                    <a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php printf( __( '%s Avatar', 'buddypress' ), $group->name ) ?>" /></a>
+                    <a href="<?php echo bp_get_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php printf( __( '%s Avatar', 'buddypress' ), $group->name ) ?>" /></a>
                 </div>
 
                 <div class="item">
-                    <div class="item-title"><a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
+                    <div class="item-title"><a href="<?php echo bp_get_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
                     <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) ?></span></div>
                     <div class="item-meta desc"><?php echo bp_create_excerpt( $group->description ) ?></div>
@@ -361 +361 @@
                 }
             ?>              <li>
-                    <a href="<?php echo bp_group_permalink( $group, false ) ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" /></a>
-                    <h5><a href="<?php echo bp_group_permalink( $group, false ) ?>"><?php echo $group->name ?></a></h5>
+                    <a href="<?php echo bp_get_group_permalink( $group ) ?>"><img src="<?php echo $group->avatar_thumb; ?>" class="avatar" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" /></a>
+                    <h5><a href="<?php echo bp_get_group_permalink( $group ) ?>"><?php echo $group->name ?></a></h5>
                 </li>
             <?php } ?>
@@ -641 +641 @@
 }
 
-function bp_group_id( $echo = true, $group = false ) {
+function bp_group_id( $deprecated = true, $deprecated2 = false ) {
     global $groups_template;
 
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_id', $group->id );
+    if ( !$deprecated )
+        return bp_get_group_id();
     else
-        return apply_filters( 'bp_group_id', $group->id );
-}
-
-function bp_group_name( $echo = true, $group = false ) {
+        echo bp_get_group_id();
+}
+    function bp_get_group_id( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_id', $group->id );
+    }
+    
+function bp_group_name( $deprecated = true, $deprecated2 = false ) {
     global $groups_template;
 
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $echo )
-        echo apply_filters( 'bp_group_name', $group->name );
+    if ( !$deprecated )
+        return bp_get_group_name();
     else
-        return apply_filters( 'bp_group_name', $group->name ); 
-}
-
-function bp_group_type( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( 'public' == $group->status ) {
-        $type = __( "Public Group", "buddypress" );
-    } else if ( 'hidden' == $group->status ) {  
-        $type = __( "Hidden Group", "buddypress" );
-    } else if ( 'private' == $group->status ) {
-        $type = __( "Private Group", "buddypress" );
-    } else {
-        $type = ucwords( $group->status ) . ' ' . __( 'Group', 'buddypress' );
-    }
-    
-    echo apply_filters( 'bp_group_type',  $type );  
-}
-
-function bp_group_avatar( $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    ?><img src="<?php echo $group->avatar_full ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_avatar_thumb( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    ?><img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_avatar_mini( $group = false) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    ?><img src="<?php echo $group->avatar_thumb ?>" width="30" height="30" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_last_active( $echo = true, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
-    
-    if ( empty( $last_active ) ) {
-        if ( $echo )
-            _e( 'not yet active', 'buddypress' );
-        else
+        echo bp_get_group_name();
+}
+    function bp_get_group_name( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_name', $group->name );
+    }
+
+function bp_group_type() {
+    echo bp_get_group_type();
+}
+    function bp_get_group_type( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        if ( 'public' == $group->status ) {
+            $type = __( "Public Group", "buddypress" );
+        } else if ( 'hidden' == $group->status ) {  
+            $type = __( "Hidden Group", "buddypress" );
+        } else if ( 'private' == $group->status ) {
+            $type = __( "Private Group", "buddypress" );
+        } else {
+            $type = ucwords( $group->status ) . ' ' . __( 'Group', 'buddypress' );
+        }
+
+        return apply_filters( 'bp_get_group_type', $type ); 
+    }
+
+function bp_group_avatar() {
+    echo bp_get_group_avatar();
+}
+    function bp_get_group_avatar( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_avatar', '<img src="' . $group->avatar_full . '" class="avatar" alt="' . $group->name . '" />', $group->avatar_full, $group->avatar_name );
+    }
+
+function bp_group_avatar_thumb() {
+    echo bp_get_group_avatar_thumb();
+}
+    function bp_get_group_avatar_thumb( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_avatar_thumb', '<img src="' . $group->avatar_thumb . '" class="avatar" alt="' . $group->name . '" />', $group->avatar_thumb, $group->avatar_name );
+    }
+
+function bp_group_avatar_mini() {
+    echo bp_get_group_avatar_mini();
+}
+    function bp_get_group_avatar_mini( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_avatar_mini', '<img src="' . $group->avatar_thumb . '" class="avatar" width="30" height="30" alt="' . $group->name . '" />', $group->avatar_thumb, $group->avatar_name );
+    }
+
+function bp_group_last_active( $deprecated = true, $deprecated2 = false ) {
+    if ( !$deprecated )
+        return bp_get_group_last_active();
+    else
+        echo bp_get_group_last_active();            
+}
+    function bp_get_group_last_active( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
+
+        if ( empty( $last_active ) ) {
             return __( 'not yet active', 'buddypress' );
-    } else {
-        if ( $echo )
-            echo apply_filters( 'bp_group_last_active', bp_core_time_since( $last_active ) );
-        else
-            return apply_filters( 'bp_group_last_active', bp_core_time_since( $last_active ) );         
-    }
-}
-
-function bp_group_permalink( $group = false, $echo = true ) {
-    global $groups_template, $bp, $current_blog;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
+        } else {
+            return apply_filters( 'bp_get_group_last_active', bp_core_time_since( $last_active ) );         
+        }
+    }
+    
+function bp_group_permalink( $deprecated = false, $deprecated2 = true ) {
+    if ( !$deprecated2 )
+        return bp_get_group_permalink();
     else
-        return apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
-}
-
-function bp_group_admin_permalink( $echo = true, $group = false ) {
-    global $groups_template, $bp, $current_blog;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' );
+        echo bp_get_group_permalink();
+}
+    function bp_get_group_permalink( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
+    }
+
+function bp_group_admin_permalink( $deprecated = true, $deprecated2 = false ) {
+    if ( !$deprecated )
+        return bp_get_group_admin_permalink();
     else
-        return apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' ); 
-}
-
-function bp_group_slug( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_slug', $group->slug );
-}
-
-function bp_group_description( $group = false, $echo = true ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $echo )
-        echo apply_filters( 'bp_group_description', stripslashes($group->description) );
+        echo bp_get_group_admin_permalink();
+}
+    function bp_get_group_admin_permalink( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' ); 
+    }
+
+function bp_group_slug() {
+    echo bp_get_group_slug();
+}
+    function bp_get_group_slug( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_slug', $group->slug );
+    }
+
+function bp_group_description( $deprecated = false, $deprecated2 = true ) {
+    if ( !$deprecated2 )
+        return bp_get_group_description();
     else
-        return apply_filters( 'bp_group_description', stripslashes($group->description) );
-}
-
-function bp_group_description_editable( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_description_editable', $group->description );
-}
-
-function bp_group_description_excerpt( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) ); 
-}
-
-function bp_group_news( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_news', stripslashes($groups_template->group->news) );
-}
-
-function bp_group_news_editable( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_news_editable', $group->news );
-}
-
-function bp_group_public_status( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->is_public ) {
-        _e('Public', 'buddypress');
-    } else {
-        _e('Private', 'buddypress');
-    }
-}
-    function bp_group_is_public( $group = false ) {
+        echo bp_get_group_description();
+}
+    function bp_get_group_description( $group = false ) {
         global $groups_template;
 
@@ -831 +808 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_group_is_public', $group->is_public );
-    }
-
-
-function bp_group_date_created( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_date_created', date( get_option( 'date_format' ), $group->date_created ) );
-}
+        return apply_filters( 'bp_get_group_description', stripslashes($group->description) );
+    }
+
+function bp_group_description_editable( $deprecated = false ) {
+    echo bp_get_group_description_editable();
+}
+    function bp_get_group_description_editable( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_description_editable', $group->description );
+    }
+
+function bp_group_description_excerpt( $deprecated = false ) {
+    echo bp_get_group_description_excerpt();
+}
+    function bp_get_group_description_excerpt( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) );   
+    }
+
+function bp_group_news( $deprecated = false ) {
+    echo bp_get_group_news();
+}
+    function bp_get_group_news( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_news', stripslashes($groups_template->group->news) );
+    }
+
+function bp_group_news_editable( $deprecated = false ) {
+    echo bp_get_group_news_editable();
+}
+    function bp_get_group_news_editable( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_news_editable', $group->news );
+    }
+
+function bp_group_public_status( $deprecated = false ) {
+    echo bp_get_group_public_status();
+}
+    function bp_get_group_public_status( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        if ( $group->is_public ) {
+            return __( 'Public', 'buddypress' );
+        } else {
+            return __( 'Private', 'buddypress' );
+        }
+    }
+    
+function bp_group_is_public( $deprecated = false ) {
+    echo bp_get_group_is_public();
+}
+    function bp_get_group_is_public( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_is_public', $group->is_public );
+    }
+
+function bp_group_date_created( $deprecated = false ) {
+    echo bp_get_group_date_created();
+}
+    function bp_get_group_date_created( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_date_created', date( get_option( 'date_format' ), $group->date_created ) );
+    }
 
 function bp_group_list_admins( $full_list = true, $group = false ) {
@@ -909 +964 @@
 }
 
-function bp_group_all_members_permalink( $echo = true, $group = false ) {
+function bp_group_all_members_permalink( $deprecated = true, $deprecated2 = false ) {
     global $groups_template, $bp;
 
@@ -915 +970 @@
         $group =& $groups_template->group;
     
-    if ( $echo )
-        echo apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, true ) . '/' . BP_MEMBERS_SLUG );
+    if ( !$deprecated )
+        return bp_get_group_all_members_permalink();
     else
-        return apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, false ) . '/' . BP_MEMBERS_SLUG );
-}
+        echo bp_get_group_all_members_permalink();
+}
+    function bp_get_group_all_members_permalink( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_all_members_permalink', bp_get_group_permalink( $group ) . '/' . BP_MEMBERS_SLUG );
+    }
 
 function bp_group_random_members( $group = false ) {
@@ -1018 +1081 @@
 
 function bp_group_pagination() {
-    global $groups_template;
-    echo apply_filters( 'bp_group_pagination', $groups_template->pag_links );
-}
+    echo bp_get_group_pagination();
+}
+    function bp_get_group_pagination() {
+        global $groups_template;
+        
+        return apply_filters( 'bp_get_group_pagination', $groups_template->pag_links );
+    }
 
 function bp_total_group_count() {
-    global $groups_template;
-    
-    echo apply_filters( 'bp_total_group_count', $groups_template->total_group_count );
-}
-
-function bp_group_total_members( $echo = true, $group = false ) {
+    echo bp_get_total_group_count();
+}
+    function bp_get_total_group_count() {
+        global $groups_template;
+
+        return apply_filters( 'bp_get_total_group_count', $groups_template->total_group_count );
+    }
+
+function bp_group_total_members( $deprecated = true, $deprecated2 = false ) {
+    if ( !$deprecated )
+        return bp_get_group_total_members();
+    else
+        echo bp_get_group_total_members();
+}
+    function bp_get_group_total_members( $echo = true, $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_total_members', $group->total_member_count );
+    }
+
+function bp_group_show_wire_setting( $group = false ) {
     global $groups_template;
 
@@ -1034 +1119 @@
         $group =& $groups_template->group;
 
-    if ( $echo )
-        echo apply_filters( 'groups_template', $group->total_member_count );
-    else
-        return apply_filters( 'groups_template', $group->total_member_count );
-}
-
-function bp_group_is_photos_enabled( $group = false ) {
+    if ( $group->enable_wire )
+        echo ' checked="checked"';
+}
+
+function bp_group_is_wire_enabled( $group = false ) {
     global $groups_template;
 
     if ( !$group )
         $group =& $groups_template->group;
-
-    if ( $group->enable_photos )
-        return true;
-    
-    return false;
-}
-
-function bp_group_show_wire_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->enable_wire )
-        echo ' checked="checked"';
-}
-
-function bp_group_is_wire_enabled( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
     
     if ( $group->enable_wire )
@@ -1074 +1135 @@
 }
 
-function bp_group_forum_permalink( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo bp_group_permalink( $group, false ) . '/forum';
-}
+function bp_group_forum_permalink( $deprecated = false ) {
+    echo bp_get_group_forum_permalink();
+}
+    function bp_get_group_forum_permalink( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_forum_permalink', bp_get_group_permalink( $group ) . '/forum' );
+    }
 
 function bp_group_is_forum_enabled( $group = false ) {
@@ -1110 +1174 @@
     
     if ( $group->enable_forum )
-        echo ' checked="checked"';
-}
-
-function bp_group_show_photos_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $group->enable_photos )
-        echo ' checked="checked"';  
-}
-
-function bp_group_show_photos_upload_setting( $permission, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( 'admin' == $permission && $group->photos_admin_only )
-        echo ' checked="checked"';
-    
-    if ( 'member' == $permission && !$group->photos_admin_only )
         echo ' checked="checked"';
 }
@@ -1231 +1272 @@
 }
 
-function bp_group_member_promote_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_member_promote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/promote/' . $members_template->member->user_id, 'groups_promote_member' ) );
-}
-
-function bp_group_member_demote_link( $user_id = false, $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
+function bp_group_member_promote_link( $user_id = false, $deprecated = false ) {
+    global $members_template;
+
     if ( !$user_id )
         $user_id = $members_template->member->user_id;
-    
-    echo apply_filters( 'bp_group_member_demote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
-}
-
-function bp_group_member_ban_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_member_ban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/ban/' . $members_template->member->user_id, 'groups_ban_member' ) );
-}
-
-function bp_group_member_unban_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_member_unban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/unban/' . $members_template->member->user_id, 'groups_unban_member' ) );   
-}
+        
+    echo bp_get_group_member_promote_link( $user_id );
+}
+    function bp_get_group_member_promote_link( $user_id = false, $group = false ) {
+        global $members_template, $groups_template, $bp;
+
+        if ( !$user_id )
+            $user_id = $members_template->member->user_id;
+            
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_member_promote_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/promote/' . $user_id, 'groups_promote_member' ) );
+    }
+
+function bp_group_member_demote_link( $user_id = false, $deprecated = false ) {
+    global $members_template;
+
+    if ( !$user_id )
+        $user_id = $members_template->member->user_id;
+
+    echo bp_get_group_member_demote_link( $user_id );
+}
+    function bp_get_group_member_demote_link( $user_id = false, $group = false ) {
+        global $members_template, $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        if ( !$user_id )
+            $user_id = $members_template->member->user_id;
+
+        return apply_filters( 'bp_get_group_member_demote_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
+    }
+    
+function bp_group_member_ban_link( $user_id = false, $deprecated = false ) {
+    global $members_template;
+
+    if ( !$user_id )
+        $user_id = $members_template->member->user_id;
+
+    echo bp_get_group_member_ban_link( $user_id );
+}
+    function bp_get_group_member_ban_link( $user_id = false, $group = false ) {
+        global $members_template, $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_member_ban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/ban/' . $user_id, 'groups_ban_member' ) );
+    }
+
+function bp_group_member_unban_link( $user_id = false, $deprecated = false ) {
+    global $members_template;
+
+    if ( !$user_id )
+        $user_id = $members_template->member->user_id;
+    
+    echo bp_get_group_member_unban_link( $user_id );    
+}
+    function bp_get_group_member_unban_link( $user_id = false, $group = false ) {
+        global $members_template;
+
+        if ( !$user_id )
+            $user_id = $members_template->member->user_id;
+        
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );  
+    }
 
 function bp_group_admin_tabs( $group = false ) {
@@ -1306 +1385 @@
 }
 
-function bp_group_form_action( $page, $group = false ) {
+function bp_group_form_action( $page, $deprecated = false ) {
+    echo bp_get_group_form_action( $page );
+}
+    function bp_get_group_form_action( $page, $group = false ) {
+        global $bp, $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_group_form_action', bp_get_group_permalink( $group ) . '/' . $page );
+    }
+    
+function bp_group_admin_form_action( $page, $deprecated = false ) {
+    echo bp_get_group_admin_form_action( $page );
+}
+    function bp_get_group_admin_form_action( $page, $group = false ) {
+        global $bp, $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_group_admin_form_action', bp_get_group_permalink( $group ) . '/admin/' . $page );
+    }
+
+function bp_group_has_requested_membership( $group = false ) {
     global $bp, $groups_template;
     
@@ -1312 +1415 @@
         $group =& $groups_template->group;
     
-    echo apply_filters( 'bp_group_form_action', bp_group_permalink( $group, false ) . '/' . $page );
-}
-
-function bp_group_admin_form_action( $page, $group = false ) {
+    if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
+        return true;
+    
+    return false;
+}
+
+function bp_group_is_member( $group = false ) {
     global $bp, $groups_template;
 
@@ -1321 +1427 @@
         $group =& $groups_template->group;
     
-    echo apply_filters( 'bp_group_admin_form_action', bp_group_permalink( $group, false ) . '/admin/' . $page );
-}
-
-function bp_group_has_requested_membership( $group = false ) {
-    global $bp, $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
-        return true;
-    
-    return false;
-}
-
-function bp_group_is_member( $group = false ) {
-    global $bp, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
     if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
         return true;
@@ -1348 +1433 @@
 }
 
-function bp_group_accept_invite_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );  
-}
-
-function bp_group_reject_invite_link( $group = false ) {
-    global $groups_template, $bp;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
-}
-
-function bp_has_friends_to_invite( $group = false ) {
-    global $groups_template, $bp;
-    
-    if ( !function_exists('friends_install') )
-        return false;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
-        return false;
-    
-    return true;
-}
-
-function bp_group_leave_confirm_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_group_permalink( $group, true ) . '/leave-group/yes', 'groups_leave_group' ) ); 
-}
-
-function bp_group_leave_reject_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_leave_reject_link', bp_group_permalink( $group, true ) );
-}
+function bp_group_accept_invite_link( $deprecated = false ) {
+    echo bp_get_group_accept_invite_link();
+}
+    function bp_get_group_accept_invite_link( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );    
+    }
+
+function bp_group_reject_invite_link( $deprecated = false ) {
+    echo bp_get_group_reject_invite_link();
+}
+    function bp_get_group_reject_invite_link( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
+    }
+
+function bp_group_leave_confirm_link( $deprecated = false ) {
+    echo bp_group_leave_confirm_link();
+}
+    function bp_get_group_leave_confirm_link( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group/yes', 'groups_leave_group' ) ); 
+    }
+
+function bp_group_leave_reject_link( $deprecated = false ) {
+    echo bp_get_group_leave_reject_link();
+}
+    function bp_get_group_leave_reject_link( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_get_group_leave_reject_link', bp_get_group_permalink( $group ) );
+    }
+
+function bp_group_send_invite_form_action( $deprecated = false ) {
+    echo bp_get_group_send_invite_form_action();
+}
+    function bp_get_group_send_invite_form_action( $group = false ) {
+        global $groups_template, $bp;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_group_send_invite_form_action', bp_get_group_permalink( $group ) . '/send-invites/send' );
+    }
 
 function bp_group_send_invite_form( $group = false ) {
@@ -1443 +1537 @@
 }
 
-function bp_group_send_invite_form_action( $group = false ) {
+function bp_has_friends_to_invite( $group = false ) {
     global $groups_template, $bp;
     
+    if ( !function_exists('friends_install') )
+        return false;
+
     if ( !$group )
         $group =& $groups_template->group;
     
-    echo apply_filters( 'bp_group_send_invite_form_action', bp_group_permalink( $group, true ) . '/send-invites/send' );
+    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
+        return false;
+    
+    return true;
 }
 
@@ -1467 +1567 @@
         case 'public':
             if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                  
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                 
             else
-                echo '<a class="join-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';                    
+                echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';                   
         break;
         
         case 'private':
             if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                      
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                     
             } else {
                 if ( !bp_group_has_requested_membership( $group ) )
-                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';        
+                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';       
                 else
-                    echo '<a class="membership-requested" href="' . bp_group_permalink( $group, false ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';               
+                    echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';              
             }
         break;
@@ -1639 +1739 @@
 
 function bp_group_member_avatar() {
-    global $members_template;
-    
-    echo apply_filters( 'bp_group_member_avatar', bp_core_get_avatar( $members_template->member->user_id, 1 ) );
-}
+    echo bp_get_group_member_avatar();
+}
+    function bp_get_group_member_avatar() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_avatar', bp_core_get_avatar( $members_template->member->user_id, 1 ) );
+    }
 
 function bp_group_member_avatar_mini( $width = 30, $height = 30 ) {
-    global $members_template;
-    
-    echo apply_filters( 'bp_group_member_avatar_mini', bp_core_get_avatar( $members_template->member->user_id, 1, $width, $height ) );
-}
+    echo bp_get_group_member_avatar_mini( $width, $height );
+}
+    function bp_get_group_member_avatar_mini( $width = 30, $height = 30 ) {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_avatar_mini', bp_core_get_avatar( $members_template->member->user_id, 1, $width, $height ) );
+    }
 
 function bp_group_member_name() {
-    global $members_template;
-        
-    echo apply_filters( 'bp_group_member_name', bp_fetch_user_fullname( $members_template->member->user_id, false ) );
-}
+    echo bp_get_group_member_name();
+}
+    function bp_get_group_member_name() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_name', bp_fetch_user_fullname( $members_template->member->user_id, false ) );
+    }
 
 function bp_group_member_url() {
-    global $members_template;
-        
-    echo apply_filters( 'bp_group_member_url', bp_core_get_userlink( $members_template->member->user_id, false, true ) );
-}
+    echo bp_get_group_member_url();
+}
+    function bp_get_group_member_url() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_url', bp_core_get_userlink( $members_template->member->user_id, false, true ) );
+    }
 
 function bp_group_member_link() {
-    global $members_template;
-    
-    echo apply_filters( 'bp_group_member_link', bp_core_get_userlink( $members_template->member->user_id ) );
-}
-
+    echo bp_get_group_member_link();
+}
+    function bp_get_group_member_link() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_link', bp_core_get_userlink( $members_template->member->user_id ) );
+    }
+    
 function bp_group_member_is_banned() {
-    global $members_template, $groups_template;
-
-    return apply_filters( 'bp_group_member_is_banned', groups_is_user_banned( $members_template->member->user_id, $groups_template->group->id ) );
-}
+    echo bp_get_group_member_is_banned();
+}
+    function bp_get_group_member_is_banned() {
+        global $members_template, $groups_template;
+
+        return apply_filters( 'bp_get_group_member_is_banned', groups_is_user_banned( $members_template->member->user_id, $groups_template->group->id ) );
+    }
 
 function bp_group_member_joined_since() {
-    global $members_template;
-    
-    echo apply_filters( 'bp_group_member_joined_since', bp_core_get_last_activity( strtotime( $members_template->member->date_modified ), __( 'joined %s ago', 'buddypress') ) );
-}
+    echo bp_get_group_member_joined_since();
+}
+    function bp_get_group_member_joined_since() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( strtotime( $members_template->member->date_modified ), __( 'joined %s ago', 'buddypress') ) );
+    }
+    
 
 function bp_group_member_id() {
-    global $members_template;
-    return apply_filters( 'bp_group_member_id', $members_template->member->user_id );
-}
+    echo bp_get_group_member_id();
+}
+    function bp_get_group_member_id() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_group_member_id', $members_template->member->user_id );
+    }
 
 function bp_group_member_needs_pagination() {
@@ -1695 +1821 @@
 
 function bp_group_pag_id() {
-    global $bp;
-    
-    echo apply_filters( 'bp_group_pag_id', 'pag' );
-}
+    echo bp_get_group_pag_id();
+}
+    function bp_get_group_pag_id() {
+        global $bp;
+
+        return apply_filters( 'bp_get_group_pag_id', 'pag' );
+    }
 
 
 function bp_group_member_pagination() {
-    global $members_template;
-    echo $members_template->pag_links;
+    echo bp_get_group_member_pagination();
     wp_nonce_field( 'bp_groups_member_list', '_member_pag_nonce' );
 }
+    function bp_get_group_member_pagination() {
+        global $members_template;
+        return apply_filters( 'bp_get_group_member_pagination', $members_template->pag_links );
+    }
 
 function bp_group_member_pagination_count() {
-    global $members_template;
-    
-    $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ); 
-
-    echo apply_filters( 'bp_group_member_pagination_count', sprintf( __( 'Viewing members %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );  
-}
+    echo bp_get_group_member_pagination_count();
+}
+    function bp_get_group_member_pagination_count() {
+        global $members_template;
+
+        $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+        $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ); 
+
+        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );  
+    }
 
 function bp_group_member_admin_pagination() {
-    global $members_template;
-    echo $members_template->pag_links;
+    echo bp_get_group_member_admin_pagination();
     wp_nonce_field( 'bp_groups_member_admin_list', '_member_admin_pag_nonce' );
 }
+    function bp_get_group_member_admin_pagination() {
+        global $members_template;
+        
+        return $members_template->pag_links;
+    }
 
 /********************************************************************************
@@ -1901 +2040 @@
 
 function bp_site_groups_pagination_links() {
-    global $site_groups_template;
-    echo $site_groups_template->pag_links;
-}
+    echo bp_get_site_groups_pagination_links();
+}
+    function bp_get_site_groups_pagination_links() {
+        global $site_groups_template;
+        
+        return apply_filters( 'bp_get_site_groups_pagination_links', $site_groups_template->pag_links );
+    }
 
 function bp_the_site_group_id() {
-    global $site_groups_template;
-    echo $site_groups_template->group->id;
-}
+    echo bp_get_the_site_group_id();
+}
+    function bp_get_the_site_group_id() {
+        global $site_groups_template;
+        
+        return apply_filters( 'bp_get_the_site_group_id', $site_groups_template->group->id );
+    }
 
 function bp_the_site_group_avatar() {
-    global $site_groups_template;
-    echo bp_group_avatar( $site_groups_template->group );
-}
+    echo bp_get_the_site_group_avatar();
+}
+    function bp_get_the_site_group_avatar() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_the_site_group_avatar', bp_group_avatar( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_avatar_thumb() {
-    global $site_groups_template;
-    echo bp_group_avatar_thumb( $site_groups_template->group );
-}
+    echo bp_get_the_site_group_avatar_thumb();
+}
+    function bp_get_the_site_group_avatar_thumb() {
+        global $site_groups_template;
+        
+        return apply_filters( 'bp_get_the_site_group_avatar_thumb', bp_group_avatar_thumb( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_avatar_mini() {
-    global $site_groups_template;
-    echo bp_group_avatar_mini( $site_groups_template->group );
-}
+    echo bp_get_the_site_group_avatar_mini();
+}
+    function bp_get_the_site_group_avatar_mini() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_avatar_mini', bp_group_avatar_mini( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_link() {
-    global $site_groups_template;
-    echo bp_group_permalink( $site_groups_template->group );
-}
+    echo bp_get_the_site_group_link();
+}
+    function bp_get_the_site_group_link() {
+        global $site_groups_template;
+        
+        return apply_filters( 'bp_get_the_site_group_link', bp_get_group_permalink( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_name() {
-    global $site_groups_template;
-    echo bp_group_name( true, $site_groups_template->group );
-}
+    echo bp_get_the_site_group_name();
+}
+    function bp_get_the_site_group_name() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_name', bp_get_group_name( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_last_active() {
-    global $site_groups_template;
-    
-    printf( __( 'active %s ago', 'buddypress' ), bp_group_last_active( false, $site_groups_template->group ) );
-}
+    echo bp_get_the_site_group_last_active();
+}
+    function bp_get_the_site_group_last_active() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_last_active', sprintf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active( $site_groups_template->group ) ) );
+    }
 
 function bp_the_site_group_join_button() {
@@ -1948 +2118 @@
 
 function bp_the_site_group_description() {
-    global $site_groups_template;
-
-    echo bp_group_description( $site_groups_template->group );  
-}
+    echo bp_get_the_site_group_description();
+}
+    function bp_get_the_site_group_description() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_description', bp_get_group_description( $site_groups_template->group ) );  
+    }
 
 function bp_the_site_group_description_excerpt() {
-    global $site_groups_template;
-
-    echo bp_create_excerpt( bp_group_description( $site_groups_template->group, false ), 35 );  
-}
+    echo bp_get_the_site_group_description_excerpt();
+}
+    function bp_get_the_site_group_description_excerpt() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_description_excerpt', bp_create_excerpt( bp_get_group_description( $site_groups_template->group, false ), 35 ) );  
+    }
 
 function bp_the_site_group_date_created() {
-    global $site_groups_template;
-
-    echo date( get_option( 'date_format' ), $site_groups_template->group->date_created );   
-}
+    echo bp_get_the_site_group_date_created();  
+}
+    function bp_get_the_site_group_date_created() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_date_created', date( get_option( 'date_format' ), $site_groups_template->group->date_created ) );  
+    }
 
 function bp_the_site_group_member_count() {
-    global $site_groups_template;
-
-    if ( 1 == (int) $site_groups_template->group->total_member_count )
-        printf( '%d member', (int) $site_groups_template->group->total_member_count );
-    else
-        printf( '%d members', (int) $site_groups_template->group->total_member_count );     
-}
+    echo bp_get_the_site_group_member_count();
+}
+    function bp_get_the_site_group_member_count() {
+        global $site_groups_template;
+
+        if ( 1 == (int) $site_groups_template->group->total_member_count )
+            return apply_filters( 'bp_get_the_site_group_member_count', sprintf( '%d member', (int) $site_groups_template->group->total_member_count ) );
+        else
+            return apply_filters( 'bp_get_the_site_group_member_count', sprintf( '%d members', (int) $site_groups_template->group->total_member_count ) );      
+    }
 
 function bp_the_site_group_type() {
-    global $site_groups_template;
-    
-    echo bp_group_type( $site_groups_template->group );
-}
-
+    echo bp_get_the_site_group_type();
+}
+    function bp_get_the_site_group_type() {
+        global $site_groups_template;
+
+        return apply_filters( 'bp_get_the_site_group_type', bp_get_group_type( $site_groups_template->group ) );
+    }
 
 function bp_the_site_group_hidden_fields() {
@@ -2138 +2322 @@
     global $requests_template, $groups_template;    
 
-    echo apply_filters( 'bp_group_request_reject_link', wp_nonce_url( bp_group_permalink( $groups_template->group, false ) . '/admin/membership-requests/reject/' . $requests_template->request->id, 'groups_reject_membership_request' ) );
+    echo apply_filters( 'bp_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . '/admin/membership-requests/reject/' . $requests_template->request->id, 'groups_reject_membership_request' ) );
 }
 
@@ -2144 +2328 @@
     global $requests_template, $groups_template;    
 
-    echo apply_filters( 'bp_group_request_accept_link', wp_nonce_url( bp_group_permalink( $groups_template->group, false ) . '/admin/membership-requests/accept/' . $requests_template->request->id, 'groups_accept_membership_request' ) );
+    echo apply_filters( 'bp_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . '/admin/membership-requests/accept/' . $requests_template->request->id, 'groups_accept_membership_request' ) );
 }
 

trunk/bp-groups/bp-groups-widgets.php

@@ -55 +55 @@
                 <li>
                     <div class="item-avatar">
-                        <a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><img src="<?php echo $group->avatar_thumb; ?>" alt="<?php echo $group->name ?> Avatar" class="avatar" /></a>
+                        <a href="<?php echo bp_get_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><img src="<?php echo $group->avatar_thumb; ?>" alt="<?php echo $group->name ?> Avatar" class="avatar" /></a>
                     </div>
 
                     <div class="item">
-                        <div class="item-title"><a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
+                        <div class="item-title"><a href="<?php echo bp_get_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
                         <div class="item-meta">
                         <span class="activity">

trunk/bp-messages/bp-messages-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_message_notice_subject', 'wptexturize' );
-add_filter( 'bp_message_notice_text', 'wptexturize' );
-add_filter( 'bp_message_thread_subject', 'wptexturize' );
-add_filter( 'bp_message_thread_excerpt', 'wptexturize' );
-add_filter( 'bp_message_content', 'wptexturize' );
-
-add_filter( 'bp_message_notice_subject', 'convert_smilies' );
-add_filter( 'bp_message_notice_text', 'convert_smilies' );
-add_filter( 'bp_message_thread_subject', 'convert_smilies' );
-add_filter( 'bp_message_thread_excerpt', 'convert_smilies' );
-add_filter( 'bp_message_content', 'convert_smilies' );
-
-add_filter( 'bp_message_notice_subject', 'convert_chars' );
-add_filter( 'bp_message_notice_text', 'convert_chars' );
-add_filter( 'bp_message_thread_subject', 'convert_chars' );
-add_filter( 'bp_message_thread_excerpt', 'convert_chars' );
-add_filter( 'bp_message_content', 'convert_chars' );
-
-add_filter( 'bp_message_notice_subject', 'wpautop' );
-add_filter( 'bp_message_notice_text', 'wpautop' );
-add_filter( 'bp_message_thread_subject', 'wpautop' );
-add_filter( 'bp_message_thread_excerpt', 'wpautop' );
-add_filter( 'bp_message_content', 'wpautop' );
-
-add_filter( 'bp_message_notice_subject', 'stripslashes_deep' );
-add_filter( 'bp_message_notice_text', 'stripslashes_deep' );
-add_filter( 'bp_message_thread_subject', 'stripslashes_deep' );
-add_filter( 'bp_message_thread_excerpt', 'stripslashes_deep' );
-add_filter( 'bp_messages_subject_value', 'stripslashes_deep' );
-add_filter( 'bp_messages_content_value', 'stripslashes_deep' );
-add_filter( 'bp_message_content', 'stripslashes_deep' );
-
-add_filter( 'bp_message_notice_subject', 'wp_filter_kses', 1 );
-add_filter( 'bp_message_notice_text', 'wp_filter_kses', 1 );
-add_filter( 'bp_message_thread_subject', 'wp_filter_kses', 1 );
-add_filter( 'bp_message_thread_excerpt', 'wp_filter_kses', 1 );
-add_filter( 'bp_messages_subject_value', 'wp_filter_kses', 1 );
-add_filter( 'bp_messages_content_value', 'wp_filter_kses', 1 );
-add_filter( 'bp_message_content', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_message_notice_subject', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_message_notice_text', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_message_thread_subject', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_message_thread_excerpt', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_messages_subject_value', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_messages_content_value', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_message_content', 'wp_filter_kses', 1 );
 add_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
 add_filter( 'messages_message_subject_before_save', 'wp_filter_kses', 1 );
 
+add_filter( 'bp_get_message_notice_subject', 'wptexturize' );
+add_filter( 'bp_get_message_notice_text', 'wptexturize' );
+add_filter( 'bp_get_message_thread_subject', 'wptexturize' );
+add_filter( 'bp_get_message_thread_excerpt', 'wptexturize' );
+add_filter( 'bp_get_message_content', 'wptexturize' );
+
+add_filter( 'bp_get_message_notice_subject', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_notice_text', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_thread_subject', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_thread_excerpt', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_content', 'convert_smilies', 2 );
+
+add_filter( 'bp_get_message_notice_subject', 'convert_chars' );
+add_filter( 'bp_get_message_notice_text', 'convert_chars' );
+add_filter( 'bp_get_message_thread_subject', 'convert_chars' );
+add_filter( 'bp_get_message_thread_excerpt', 'convert_chars' );
+add_filter( 'bp_get_message_content', 'convert_chars' );
+
+add_filter( 'bp_get_message_notice_subject', 'wpautop' );
+add_filter( 'bp_get_message_notice_text', 'wpautop' );
+add_filter( 'bp_get_message_thread_subject', 'wpautop' );
+add_filter( 'bp_get_message_thread_excerpt', 'wpautop' );
+add_filter( 'bp_get_message_content', 'wpautop' );
+
+add_filter( 'bp_get_message_notice_subject', 'stripslashes_deep' );
+add_filter( 'bp_get_message_notice_text', 'stripslashes_deep' );
+add_filter( 'bp_get_message_thread_subject', 'stripslashes_deep' );
+add_filter( 'bp_get_message_thread_excerpt', 'stripslashes_deep' );
+add_filter( 'bp_get_messages_subject_value', 'stripslashes_deep' );
+add_filter( 'bp_get_messages_content_value', 'stripslashes_deep' );
+add_filter( 'bp_get_message_content', 'stripslashes_deep' );
+
 ?>

trunk/bp-messages/bp-messages-templatetags.php

@@ -148 +148 @@
 
 function bp_message_thread_id() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_id', $messages_template->thread->thread_id );
-}
+    echo bp_get_message_thread_id();
+}
+    function bp_get_message_thread_id() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_thread_id', $messages_template->thread->thread_id );
+    }
 
 function bp_message_thread_subject() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_subject', stripslashes_deep( $messages_template->thread->last_message_subject ) );
-}
+    echo bp_get_message_thread_subject();
+}
+    function bp_get_message_thread_subject() {
+        global $messages_template;
+        return apply_filters( 'bp_message_thread_subject', stripslashes_deep( $messages_template->thread->last_message_subject ) );
+    }
 
 function bp_message_thread_excerpt() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_excerpt', bp_create_excerpt($messages_template->thread->last_message_message, 20) );
-}
+    echo bp_get_message_thread_excerpt();
+}
+    function bp_get_message_thread_excerpt() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_thread_excerpt', bp_create_excerpt($messages_template->thread->last_message_message, 20) );
+    }
 
 function bp_message_thread_from() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_from', bp_core_get_userlink($messages_template->thread->last_sender_id) );
-}
+    echo bp_get_message_thread_from();
+}
+    function bp_get_message_thread_from() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_thread_from', bp_core_get_userlink($messages_template->thread->last_sender_id) );
+    }
 
 function bp_message_thread_to() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_to', BP_Messages_Thread::get_recipient_links($messages_template->thread->recipients) );
-}
+    echo bp_get_message_thread_to();
+}
+    function bp_get_message_thread_to() {
+        global $messages_template;
+        return apply_filters( 'bp_message_thread_to', BP_Messages_Thread::get_recipient_links($messages_template->thread->recipients) );
+    }
 
 function bp_message_thread_view_link() {
-    global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_view_link', $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id );
-}
-
+    echo bp_get_message_thread_view_link();
+}
+    function bp_get_message_thread_view_link() {
+        global $messages_template, $bp;
+        return apply_filters( 'bp_get_message_thread_view_link', $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id );
+    }
+    
 function bp_message_thread_delete_link() {
-    global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id, 'messages_delete_thread' ) );
-}
-
+    echo bp_get_message_thread_delete_link();
+}
+    function bp_get_message_thread_delete_link() {
+        global $messages_template, $bp;
+        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id, 'messages_delete_thread' ) );
+    }
+    
 function bp_message_thread_has_unread() {
     global $messages_template;
-    
+
     if ( $messages_template->thread->unread_count )
         return true;
@@ -192 +213 @@
 
 function bp_message_thread_unread_count() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_unread_count', $messages_template->thread->unread_count );
-}
+    echo bp_get_message_thread_unread_count();
+}
+    function bp_get_message_thread_unread_count() {
+        global $messages_template;
+        
+        if ( (int)$messages_template->thread->unread_count )
+            return apply_filters( 'bp_get_message_thread_unread_count', $messages_template->thread->unread_count );
+        
+        return false;
+    }
 
 function bp_message_thread_last_post_date() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_last_post_date', bp_format_time( strtotime($messages_template->thread->last_post_date) ) );
-}
+    echo bp_get_message_thread_last_post_date();
+}
+    function bp_get_message_thread_last_post_date() {
+        global $messages_template;
+        echo apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( strtotime($messages_template->thread->last_post_date) ) );
+    }
 
 function bp_message_thread_avatar() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_thread_avatar', bp_core_get_avatar($messages_template->thread->last_sender_id, 1) );
-}
+    echo bp_get_message_thread_avatar();
+}
+    function bp_get_message_thread_avatar() {
+        global $messages_template;
+        echo apply_filters( 'bp_get_message_thread_avatar', bp_core_get_avatar($messages_template->thread->last_sender_id, 1) );
+    }
 
 function bp_message_thread_view() {
@@ -213 +247 @@
 
 function bp_total_unread_messages_count() {
-    echo BP_Messages_Thread::get_inbox_count();
-}
+    echo bp_get_total_unread_messages_count();
+}
+    function bp_get_total_unread_messages_count() {
+        return apply_filters( 'bp_get_total_unread_messages_count', BP_Messages_Thread::get_inbox_count() );
+    }
 
 function bp_messages_pagination() {
-    global $messages_template;
-    echo apply_filters( 'bp_messages_pagination', $messages_template->pag_links );
-}
+    echo bp_get_messages_pagination();
+}
+    function bp_get_messages_pagination() {
+        global $messages_template;
+        return apply_filters( 'bp_get_messages_pagination', $messages_template->pag_links );
+    }
 
 function bp_messages_form_action() {
-    global $bp;
-    
-    echo apply_filters( 'bp_messages_form_action', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action );
-}
+    echo bp_get_messages_form_action();
+}
+    
+    function bp_get_messages_form_action() {
+        global $bp;
+
+        return apply_filters( 'bp_get_messages_form_action', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action );
+    }
 
 function bp_messages_username_value() {
-    if ( isset( $_SESSION['send_to'] ) ) {
-        echo apply_filters( 'bp_messages_username_value', $_SESSION['send_to'] );
-    } else if ( isset( $_GET['r'] ) && !isset( $_SESSION['send_to'] ) ) {
-        echo apply_filters( 'bp_messages_username_value', $_GET['r'] );
-    }
-}
+    echo bp_get_messages_username_value();
+}
+    function bp_get_messages_username_value() {
+        if ( isset( $_SESSION['send_to'] ) ) {
+            return apply_filters( 'bp_get_messages_username_value', $_SESSION['send_to'] );
+        } else if ( isset( $_GET['r'] ) && !isset( $_SESSION['send_to'] ) ) {
+            return apply_filters( 'bp_get_messages_username_value', $_GET['r'] );
+        }
+    }
 
 function bp_messages_subject_value() {
-    echo apply_filters( 'bp_messages_subject_value', $_SESSION['subject'] );
-}
+    echo bp_get_messages_subject_value();
+}
+    function bp_get_messages_subject_value() {
+        return apply_filters( 'bp_get_messages_subject_value', $_SESSION['subject'] );
+    }
 
 function bp_messages_content_value() {
-    echo apply_filters( 'bp_messages_content_value', $_SESSION['content'] );
-}
+    echo bp_get_messages_content_value();
+}
+    function bp_get_messages_content_value() {
+        return apply_filters( 'bp_get_messages_content_value', $_SESSION['content'] );
+    }
 
 function bp_messages_options() {
@@ -267 +320 @@
     if ( $messages_template->thread->is_active ) {
         echo "<strong>";
-        _e('Currently Active', 'buddypress');
+        _e( 'Currently Active', 'buddypress' );
         echo "</strong>";
     }
 }
+    function bp_get_message_is_active_notice() {
+        global $messages_template;
+
+        if ( $messages_template->thread->is_active )
+            return true;
+        
+        return false;
+    }
 
 function bp_message_notice_post_date() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_notice_post_date', bp_format_time( strtotime($messages_template->thread->date_sent) ) );
-}
+    echo bp_get_message_notice_post_date();
+}
+    function bp_get_message_notice_post_date() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_notice_post_date', bp_format_time( strtotime($messages_template->thread->date_sent) ) );
+    }
 
 function bp_message_notice_subject() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_notice_subject', $messages_template->thread->subject );
-}
+    echo bp_get_message_notice_subject();
+}
+    function bp_get_message_notice_subject() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_notice_subject', $messages_template->thread->subject );
+    }
 
 function bp_message_notice_text() {
-    global $messages_template;
-    echo apply_filters( 'bp_message_notice_text', $messages_template->thread->message );
-}
+    echo bp_get_message_notice_text();
+}
+    function bp_get_message_notice_text() {
+        global $messages_template;
+        return apply_filters( 'bp_get_message_notice_text', $messages_template->thread->message );
+    }
 
 function bp_message_notice_delete_link() {
-    global $messages_template, $bp;
-    
-    echo apply_filters( 'bp_message_notice_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/delete/' . $messages_template->thread->id, 'messages_delete_thread' ) );
-}
+    echo bp_get_message_notice_delete_link();
+}
+    function bp_get_message_notice_delete_link() {
+        global $messages_template, $bp;
+
+        return apply_filters( 'bp_get_message_notice_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/delete/' . $messages_template->thread->id, 'messages_delete_thread' ) );
+    }
 
 function bp_message_activate_deactivate_link() {
-    global $messages_template, $bp;
-
-    if ( 1 == (int)$messages_template->thread->is_active ) {
-        $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id, 'messages_deactivate_notice' );
-    } else {
-        $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );       
-    }
-    echo apply_filters( 'bp_message_activate_deactivate_link', $link );
-}
+    echo bp_get_message_activate_deactivate_link();
+}
+    function bp_get_message_activate_deactivate_link() {
+        global $messages_template, $bp;
+
+        if ( 1 == (int)$messages_template->thread->is_active ) {
+            $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id, 'messages_deactivate_notice' );
+        } else {
+            $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );       
+        }
+        return apply_filters( 'bp_get_message_activate_deactivate_link', $link );
+    }
 
 function bp_message_activate_deactivate_text() {
-    global $messages_template;
-    
-    if ( 1 == (int)$messages_template->thread->is_active  ) {
-        $text = __('Deactivate', 'buddypress');
-    } else {
-        $text = __('Activate', 'buddypress');       
-    }
-    echo apply_filters( 'bp_message_activate_deactivate_text', $text );
-}
+    echo bp_get_message_activate_deactivate_text();
+}
+    function bp_get_message_activate_deactivate_text() {
+        global $messages_template;
+
+        if ( 1 == (int)$messages_template->thread->is_active  ) {
+            $text = __('Deactivate', 'buddypress');
+        } else {
+            $text = __('Activate', 'buddypress');       
+        }
+        return apply_filters( 'bp_message_activate_deactivate_text', $text );
+    }
 
 function bp_message_get_notices() {
@@ -352 +431 @@
 
 function bp_message_loading_image_src() {
-    global $bp;
-    echo $bp->messages->image_base . '/ajax-loader.gif';
-}
+    echo bp_get_message_loading_image_src();
+}
+    function bp_get_message_loading_image_src() {
+        global $bp;
+        return apply_filters( 'bp_get_message_loading_image_src', $bp->messages->image_base . '/ajax-loader.gif' );
+    }
 
 function bp_message_get_recipient_tabs() {
@@ -377 +459 @@
 
 function bp_message_get_recipient_usernames() {
-    echo $_GET['r'];
-}
-
+    echo bp_get_message_get_recipient_usernames();
+}
+    function bp_get_message_get_recipient_usernames() {
+        return apply_filters( 'bp_get_message_get_recipient_usernames', $_GET['r'] );
+    }
+    
 function messages_view_thread( $thread_id ) {
     global $bp;
@@ -418 +503 @@
                     <div class="message-box<?php echo $alt ?>">
                         <div class="avatar-box">
-                            <?php echo apply_filters( 'bp_message_sender_avatar', bp_core_get_avatar( $message->sender_id, 1 ) ) ?>
-                            <h3><?php echo apply_filters( 'bp_message_sender_id', bp_core_get_userlink( $message->sender_id ) ) ?></h3>
-                            <small><?php echo apply_filters( 'bp_message_date_sent', bp_format_time( strtotime($message->date_sent ) ) ) ?></small>
+                            <?php echo apply_filters( 'bp_get_message_sender_avatar', bp_core_get_avatar( $message->sender_id, 1 ) ) ?>
+                            <h3><?php echo apply_filters( 'bp_get_message_sender_id', bp_core_get_userlink( $message->sender_id ) ) ?></h3>
+                            <small><?php echo apply_filters( 'bp_get_message_date_sent', bp_format_time( strtotime($message->date_sent ) ) ) ?></small>
                         </div>
                         
                         <?php do_action( 'messages_custom_fields_output_before' ) ?>
                         
-                        <?php echo apply_filters( 'bp_message_content', stripslashes($message->message) ); ?>
+                        <?php echo apply_filters( 'bp_get_message_content', stripslashes($message->message) ); ?>
                         
                         <?php do_action( 'messages_custom_fields_output_after' ) ?>
@@ -448 +533 @@
                                 <label for="reply"></label>
                                 <div>
-                                    <textarea name="content" id="message_content" rows="15" cols="40"><?php echo $content; ?></textarea>
+                                    <textarea name="content" id="message_content" rows="15" cols="40"><?php echo attribute_escape( wp_filter_kses( $content ) ); ?></textarea>
                                 </div>
                             </div>

trunk/bp-wire/bp-wire-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_wire_post_content', 'wptexturize' );
-
-add_filter( 'bp_wire_post_content', 'convert_smilies' );
-
-add_filter( 'bp_wire_post_content', 'convert_chars' );
-
-add_filter( 'bp_wire_post_content', 'wpautop' );
-
-add_filter( 'bp_wire_post_content', 'stripslashes_deep' );
-
-add_filter( 'bp_wire_post_content', 'make_clickable' );
-
-add_filter( 'bp_wire_post_content', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_wire_post_content', 'wp_filter_kses', 1 );
 add_filter( 'bp_wire_post_content_before_save', 'wp_filter_kses', 1 );
 
+add_filter( 'bp_get_wire_post_content', 'wptexturize' );
+
+add_filter( 'bp_get_wire_post_content', 'convert_smilies', 2 );
+
+add_filter( 'bp_get_wire_post_content', 'convert_chars' );
+
+add_filter( 'bp_get_wire_post_content', 'wpautop' );
+
+add_filter( 'bp_get_wire_post_content', 'stripslashes_deep' );
+
+add_filter( 'bp_get_wire_post_content', 'make_clickable' );
+
 ?>

trunk/bp-wire/bp-wire-templatetags.php

@@ -156 +156 @@
 
 function bp_wire_title() {
-    global $bp_wire_header;
-    echo apply_filters( 'bp_group_reject_invite_link', $bp_wire_header );
-}
-
-function bp_wire_item_id( $echo = false ) {
+    echo bp_get_wire_title();
+}
+    function bp_get_wire_title() {
+        global $bp_wire_header;
+        return apply_filters( 'bp_get_wire_title', $bp_wire_header );
+    }
+    
+function bp_wire_item_id( $deprecated = false ) {
     global $bp_item_id;
     
-    if ( $echo )
-        echo apply_filters( 'bp_wire_item_id', $bp_item_id );
-    else
-        return apply_filters( 'bp_wire_item_id', $bp_item_id );
-}
+    if ( $deprecated )
+        echo bp_get_wire_item_id();
+    else
+        return bp_get_wire_item_id();
+}
+    function bp_get_wire_item_id() {
+        global $bp_item_id;
+
+        return apply_filters( 'bp_get_wire_item_id', $bp_item_id );
+    }
 
 function bp_wire_no_posts_message() {
-    global $bp_wire_msg;
-    echo apply_filters( 'bp_wire_no_posts_message', $bp_wire_msg );
-}
-
+    echo bp_get_wire_no_posts_message();
+}
+    function bp_get_wire_no_posts_message() {
+        global $bp_wire_msg;
+        return apply_filters( 'bp_get_wire_no_posts_message', $bp_wire_msg );
+    }
+    
 function bp_wire_can_post() {
     global $bp_wire_can_post;
@@ -184 +195 @@
 }
 
-function bp_wire_post_id( $echo = true ) {
-    global $wire_posts_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_wire_post_id', $wire_posts_template->wire_post->id );
-    else
-        return apply_filters( 'bp_wire_post_id', $wire_posts_template->wire_post->id );
-}
+function bp_wire_post_id( $deprecated = true ) {
+    global $wire_posts_template;
+    
+    if ( !$deprecated )
+        return bp_get_wire_post_id();
+    else
+        echo bp_get_wire_post_id();
+}
+    function bp_get_wire_post_id() {
+        global $wire_posts_template;
+
+        return apply_filters( 'bp_get_wire_post_id', $wire_posts_template->wire_post->id );
+    }
 
 function bp_wire_post_content() {
-    global $wire_posts_template;
-
-    echo apply_filters( 'bp_wire_post_content', $wire_posts_template->wire_post->content );
-}
+    echo bp_get_wire_post_content();
+}
+    function bp_get_wire_post_content() {
+        global $wire_posts_template;
+
+        return apply_filters( 'bp_get_wire_post_content', $wire_posts_template->wire_post->content );
+    }
 
 function bp_wire_needs_pagination() {
@@ -209 +228 @@
 
 function bp_wire_pagination() {
-    global $wire_posts_template;
-    echo $wire_posts_template->pag_links;
+    echo bp_get_wire_pagination();
     wp_nonce_field( 'get_wire_posts' );
 }
-
+    function bp_get_wire_pagination() {
+        global $wire_posts_template;
+        return apply_filters( 'bp_get_wire_pagination', $wire_posts_template->pag_links );
+    }
+    
 function bp_wire_pagination_count() {
-    global $wire_posts_template;
-    
-    $from_num = intval( ( $wire_posts_template->pag_page - 1 ) * $wire_posts_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1); 
-    
-    echo apply_filters( 'bp_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );  
-}
-
+    echo bp_get_wire_pagination_count();
+}
+    function bp_get_wire_pagination_count() {
+        global $wire_posts_template;
+
+        $from_num = intval( ( $wire_posts_template->pag_page - 1 ) * $wire_posts_template->pag_num ) + 1;
+        $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1); 
+
+        return apply_filters( 'bp_get_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );  
+    }
+    
 function bp_wire_ajax_loader_src() {
-    global $bp;
-    
-    echo apply_filters( 'bp_wire_ajax_loader_src', $bp->wire->image_base . '/ajax-loader.gif' );
-}
-
-function bp_wire_post_date( $date_format = null, $echo = true ) {
-    global $wire_posts_template;
-
-    if ( !$date_format )
-        $date_format = get_option('date_format');
-        
-    if ( $echo )
-        echo apply_filters( 'bp_wire_post_date', mysql2date( $date_format, $wire_posts_template->wire_post->date_posted ) );
-    else
-        return apply_filters( 'bp_wire_post_date', mysql2date( $date_format, $wire_posts_template->wire_post->date_posted ) );
-}
-
-function bp_wire_post_author_name( $echo = true ) {
-    global $wire_posts_template;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_wire_post_author_name', bp_core_get_userlink( $wire_posts_template->wire_post->user_id ) );
-    else
-        return apply_filters( 'bp_wire_post_author_name', bp_core_get_userlink( $wire_posts_template->wire_post->user_id ) );
-}
+    echo bp_get_wire_ajax_loader_src();
+}
+    function bp_get_wire_ajax_loader_src() {
+        global $bp;
+
+        return apply_filters( 'bp_get_wire_ajax_loader_src', $bp->wire->image_base . '/ajax-loader.gif' );
+    }
+
+function bp_wire_post_date( $deprecated = null, $deprecated2 = true ) {
+    global $wire_posts_template;
+
+    if ( !$deprecated2 )
+        return bp_get_wire_post_date();
+    else
+        echo bp_get_wire_post_date();
+}
+    function bp_get_wire_post_date() {
+        global $wire_posts_template;
+        
+        return apply_filters( 'bp_get_wire_post_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format'), $wire_posts_template->wire_post->date_posted ) );
+    }
+
+function bp_wire_post_author_name( $deprecated = true ) {
+    global $wire_posts_template;
+    
+    if ( !$deprecated )
+        return bp_get_wire_post_author_name();
+    else
+        echo bp_get_wire_post_author_name();
+}
+    function bp_get_wire_post_author_name() {
+        global $wire_posts_template;
+
+        return apply_filters( 'bp_get_wire_post_author_name', bp_core_get_userlink( $wire_posts_template->wire_post->user_id ) );
+    }
 
 function bp_wire_post_author_avatar() {
-    global $wire_posts_template;
-    
-    echo apply_filters( 'bp_wire_post_author_avatar', bp_core_get_avatar( $wire_posts_template->wire_post->user_id, 1 ) );
-}
+    echo bp_get_wire_post_author_avatar();
+}
+    function bp_get_wire_post_author_avatar() {
+        global $wire_posts_template;
+
+        return apply_filters( 'bp_get_wire_post_author_avatar', bp_core_get_avatar( $wire_posts_template->wire_post->user_id, 1 ) );
+    }
 
 function bp_wire_get_post_form() {
@@ -264 +302 @@
 
 function bp_wire_get_action() {
-    global $bp;
-    
-    if ( empty( $bp->current_item ) )
-        $uri = $bp->current_action;
-    else
-        $uri = $bp->current_item;
-    
-    if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
-        echo apply_filters( 'bp_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
-    } else {
-        echo apply_filters( 'bp_wire_get_action', site_url() . '/' . $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/post/' );
-    }
-}
+    echo bp_get_wire_get_action();
+}
+    function bp_get_wire_get_action() {
+        global $bp;
+
+        if ( empty( $bp->current_item ) )
+            $uri = $bp->current_action;
+        else
+            $uri = $bp->current_item;
+
+        if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
+            return apply_filters( 'bp_get_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
+        } else {
+            return apply_filters( 'bp_get_wire_get_action', site_url() . '/' . $bp->{$bp->current_component}->slug . '/' . $uri . '/' . $bp->wire->slug . '/post/' );
+        }
+    }
 
 function bp_wire_poster_avatar() {
-    global $bp;
-    
-    echo apply_filters( 'bp_wire_poster_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 1 ) );
-}
-
-function bp_wire_poster_name( $echo = true ) {
-    global $bp;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_wire_poster_name', '<a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '">' . __('You', 'buddypress') . '</a>' );
-    else
-        return apply_filters( 'bp_wire_poster_name', '<a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '">' . __('You', 'buddypress') . '</a>' );
-}
-
-function bp_wire_poster_date( $date_format = null, $echo = true ) {
-    if ( !$date_format )
-        $date_format = get_option('date_format');
-
-    if ( $echo )
-        echo apply_filters( 'bp_wire_poster_date', mysql2date( $date_format, date("Y-m-d H:i:s") ) );
-    else
-        return apply_filters( 'bp_wire_poster_date', mysql2date( $date_format, date("Y-m-d H:i:s") ) ); 
-}
+    echo bp_get_wire_poster_avatar();
+}
+    function bp_get_wire_poster_avatar() {
+        global $bp;
+
+        return apply_filters( 'bp_get_wire_poster_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 1 ) );
+    }
+
+function bp_wire_poster_name( $deprecated = true ) {
+    if ( !$deprecated )
+        return bp_get_wire_poster_name();
+    else
+        echo bp_get_wire_poster_name();
+}
+    function bp_get_wire_poster_name() {
+        global $bp;
+
+        return apply_filters( 'bp_get_wire_poster_name', '<a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '">' . __('You', 'buddypress') . '</a>' );
+    }
+
+function bp_wire_poster_date( $deprecated = null, $deprecated2 = true ) {
+    if ( !$deprecated2 )
+        return bp_get_wire_poster_date();
+    else
+        echo bp_get_wire_poster_date(); 
+}
+    function bp_get_wire_poster_date() {
+        return apply_filters( 'bp_get_wire_poster_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format' ), date("Y-m-d H:i:s") ) );   
+    }
 
 function bp_wire_delete_link() {
-    global $wire_posts_template, $bp;
-
-    if ( empty( $bp->current_item ) )
-        $uri = $bp->current_action;
-    else
-        $uri = $bp->current_item;
-        
-    if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() ) {
-        if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
-            echo apply_filters( 'bp_wire_delete_link', '<a href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+    echo bp_get_wire_delete_link();
+}
+    function bp_get_wire_delete_link() {
+        global $wire_posts_template, $bp;
+
+        if ( empty( $bp->current_item ) )
+            $uri = $bp->current_action;
+        else
+            $uri = $bp->current_item;
+
+        if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() ) {
+            if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
+                return apply_filters( 'bp_get_wire_delete_link', '<a href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+            } else {
+                return apply_filters( 'bp_get_wire_delete_link', '<a href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+            }
+        }
+    }
+
+function bp_wire_see_all_link() {
+    echo bp_get_wire_see_all_link();
+}
+    function bp_get_wire_see_all_link() {
+        global $bp;
+
+        if ( empty( $bp->current_item ) )
+            $uri = $bp->current_action;
+        else
+            $uri = $bp->current_item;
+
+        if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
+            return apply_filters( 'bp_get_wire_see_all_link', $bp->displayed_user->domain . $bp->wire->slug );
         } else {
-            echo apply_filters( 'bp_wire_delete_link', '<a href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
-        }
-    }
-}
-
-function bp_wire_see_all_link() {
-    global $bp;
-    
-    if ( empty( $bp->current_item ) )
-        $uri = $bp->current_action;
-    else
-        $uri = $bp->current_item;
-    
-    if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
-        echo apply_filters( 'bp_wire_see_all_link', $bp->displayed_user->domain . $bp->wire->slug );
-    } else {
-        echo apply_filters( 'bp_wire_see_all_link', $bp->root_domain . '/' . $bp->groups->slug . '/' . $uri . '/wire' );
-    }
-}
+            return apply_filters( 'bp_get_wire_see_all_link', $bp->root_domain . '/' . $bp->groups->slug . '/' . $uri . '/wire' );
+        }
+    }
 
 function bp_custom_wire_boxes_before() {

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_the_profile_field_value', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_profile_field_value', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_get_field_data', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_field_name_before_save', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_field_description_before_save', 'wp_filter_kses', 1 );
 
-add_filter( 'bp_the_profile_field_value', 'wptexturize' );
-add_filter( 'bp_the_profile_field_value', 'convert_smilies' );
-add_filter( 'bp_the_profile_field_value', 'convert_chars' );
-add_filter( 'bp_the_profile_field_value', 'wpautop' );
-add_filter( 'bp_the_profile_field_value', 'make_clickable' );
-add_filter( 'bp_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
-add_filter( 'bp_the_profile_field_value', 'xprofile_filter_link_profile_data', 2, 2 );
-
-add_filter( 'bp_the_profile_field_type', 'wptexturize' );
-add_filter( 'bp_the_profile_field_type', 'convert_smilies' );
-add_filter( 'bp_the_profile_field_type', 'convert_chars' );
+add_filter( 'bp_get_the_profile_field_value', 'wptexturize' );
+add_filter( 'bp_get_the_profile_field_value', 'convert_smilies', 2 );
+add_filter( 'bp_get_the_profile_field_value', 'convert_chars' );
+add_filter( 'bp_get_the_profile_field_value', 'wpautop' );
+add_filter( 'bp_get_the_profile_field_value', 'make_clickable' );
+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 2, 2 );
 
 /* Custom BuddyPress filters */

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -193 +193 @@
 
 function bp_the_profile_group_name() {
-    global $group;
-    echo apply_filters( 'bp_the_profile_group_name', $group->name );
-}
+    echo bp_get_the_profile_group_name();
+}
+    function bp_get_the_profile_group_name() {
+        global $group;
+        return apply_filters( 'bp_get_the_profile_group_name', $group->name );
+    }
 
 function bp_the_profile_group_description() {
-    global $group;
-    echo apply_filters( 'bp_the_profile_group_description', $group->description );
-}
-
+    echo bp_get_the_profile_group_description();
+}
+    function bp_get_the_profile_group_description() {
+        global $group;
+        echo apply_filters( 'bp_get_the_profile_group_description', $group->description );
+    }
+    
 function bp_profile_fields() {
     global $profile_template;
@@ -213 +219 @@
 
 function bp_the_profile_field_name() {
-    global $field;
-    echo apply_filters( 'bp_the_profile_field_name', $field->name );
-}
+    echo bp_get_the_profile_field_name();
+}
+    function bp_get_the_profile_field_name() {
+        global $field;
+        return apply_filters( 'bp_get_the_profile_field_name', $field->name );
+    }
 
 function bp_the_profile_field_value() {
-    global $field;
-
-    $field->data->value = bp_unserialize_profile_field( $field->data->value );
-
-    echo apply_filters( 'bp_the_profile_field_value', $field->data->value, $field->type, $field->id );
-}
+    echo bp_get_the_profile_field_value();
+}
+    function bp_get_the_profile_field_value() {
+        global $field;
+
+        $field->data->value = bp_unserialize_profile_field( $field->data->value );
+
+        return apply_filters( 'bp_get_the_profile_field_value', $field->data->value, $field->type, $field->id );
+    }
 
 function bp_unserialize_profile_field( $value ) {
@@ -259 +271 @@
 }
 
-function bp_profile_group_name( $echo = true ) {
+function bp_profile_group_name( $deprecated = true ) {
     global $bp;
     
@@ -272 +284 @@
     }
     
-    if ( $echo ) {
-        echo apply_filters( 'bp_xprofile_profile_group_name', $group->name );
+    if ( !$deprecated ) {
+        return bp_get_profile_group_name();
     } else {
-        return apply_filters( 'bp_xprofile_profile_group_name', $group->name );
-    }
-}
+        echo bp_get_profile_group_name();
+    }
+}
+    function bp_get_profile_group_name( $deprecated = true ) {
+        global $bp;
+
+        $group_id = $bp->action_variables[1];
+
+        if ( !is_numeric( $group_id ) )
+            $group_id = 1;
+
+        if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
+            $group = new BP_XProfile_Group($group_id);
+            wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
+        }
+
+        return apply_filters( 'bp_get_profile_group_name', $group->name );
+    }
 
 function bp_edit_profile_form() {
@@ -302 +329 @@
     global $bp;
     
-    $last_updated = get_usermeta( $bp->displayed_user->id, 'profile_last_updated' );
+    $last_updated = bp_get_profile_last_updated();
 
     if ( !$last_updated ) {
-        _e('Profile not recently updated', 'buddypress') . '.';
+        _e( 'Profile not recently updated', 'buddypress' ) . '.';
     } else {
-        echo apply_filters( 'bp_wire_poster_date', sprintf( __('Profile updated %s ago', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) ); 
-    }
-}
+        echo $last_updated;
+    }
+}
+    function bp_get_profile_last_updated() {
+        global $bp;
+
+        $last_updated = get_usermeta( $bp->displayed_user->id, 'profile_last_updated' );
+
+        if ( $last_updated )
+            return apply_filters( 'bp_get_profile_last_updated', sprintf( __('Profile updated %s ago', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) ); 
+        
+        return false;
+    }
+    
 
 function bp_edit_profile_button() {