<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2678] trunk:
Moving blog and comment template loops to the backwards compatibility plugin since they are deprecated by the activity stream filters
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2678</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-11 15:48:07 +0000 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moving blog and comment template loops to the backwards compatibility plugin since they are deprecated by the activity stream filters. Also moved classic template filters since the classic theme no longer exists in the core.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-activity.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -1063,24 +1063,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * bp_activity_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function bp_activity_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
-
- add_filter( 'bp_activity_template_my_activity', create_function( '', 'return "activity/just-me";' ) );
- add_filter( 'bp_activity_template_friends_activity', create_function( '', 'return "activity/my-friends";' ) );
- add_filter( 'bp_activity_template_profile_activity_permalink', create_function( '', 'return "activity/single";' ) );
-}
-add_action( 'widgets_init', 'bp_activity_filter_template_paths' );
-
</del><span class="cx"> function bp_activity_remove_data( $user_id ) {
</span><span class="cx"> // Clear the user's activity from the sitewide stream and clear their activity tables
</span><span class="cx"> bp_activity_delete( array( 'user_id' => $user_id ) );
</span></span></pre></div>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -297,698 +297,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
</span><span class="cx">
</span><del>-/***
- * Technically the template loops for blog posts and comments are deprecated.
- * Instead you should be using the activity stream template loop and filtering
- * on blog posts and blog comments either with or without a user_id.
- *
- * They remain here because they are used in the bp-sn-parent theme, but they
- * are running on thin ice.
- */
</del><span class="cx">
</span><del>-/**********************************************************************
- * User Blog Posts listing template class
- */
-
-class BP_Blogs_Blog_Post_Template {
- var $current_post = -1;
- var $post_count;
- var $posts;
- var $post;
-
- var $in_the_loop;
-
- var $pag_page;
- var $pag_num;
- var $pag_links;
- var $total_post_count;
-
- function bp_blogs_blog_post_template( $user_id, $per_page, $max ) {
- global $bp;
-
- if ( !$user_id )
- $user_id = $bp->displayed_user->id;
-
- $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
- $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-
- if ( !$this->posts = wp_cache_get( 'bp_user_posts_' . $user_id, 'bp' ) ) {
- $this->posts = bp_blogs_get_posts_for_user( $user_id );
- wp_cache_set( 'bp_user_posts_' . $user_id, $this->posts, 'bp' );
- }
-
- if ( !$max || $max >= (int)$this->posts['count'] )
- $this->total_post_count = (int)$this->posts['count'];
- else
- $this->total_post_count = (int)$max;
-
- $this->posts = array_slice( (array)$this->posts['posts'], intval( ( $this->pag_page - 1 ) * $this->pag_num), intval( $this->pag_num ) );
-
- if ( $max ) {
- if ( $max >= count($this->posts) )
- $this->post_count = count($this->posts);
- else
- $this->post_count = (int)$max;
- } else {
- $this->post_count = count($this->posts);
- }
-
- $this->pag_links = paginate_links( array(
- 'base' => add_query_arg( 'fpage', '%#%' ),
- 'format' => '',
- 'total' => ceil($this->total_post_count / $this->pag_num),
- 'current' => $this->pag_page,
- 'prev_text' => '&larr;',
- 'next_text' => '&rarr;',
- 'mid_size' => 1
- ));
- }
-
- function has_posts() {
- if ( $this->post_count )
- return true;
-
- return false;
- }
-
- function next_post() {
- $this->current_post++;
- $this->post = $this->posts[$this->current_post];
-
- return $this->post;
- }
-
- function rewind_posts() {
- $this->current_post = -1;
- if ( $this->post_count > 0 ) {
- $this->post = $this->posts[0];
- }
- }
-
- function user_posts() {
- if ( $this->current_post + 1 < $this->post_count ) {
- return true;
- } elseif ( $this->current_post + 1 == $this->post_count ) {
- do_action('loop_end');
- // Do some cleaning up after the loop
- $this->rewind_posts();
- }
-
- $this->in_the_loop = false;
- return false;
- }
-
- function the_post() {
- global $post;
-
- $this->in_the_loop = true;
- $post = $this->next_post();
-
- if ( 0 == $this->current_post ) // loop has just started
- do_action('loop_start');
- }
-}
-
-function bp_has_posts( $args = '' ) {
- global $posts_template;
-
- $defaults = array(
- 'user_id' => false,
- 'per_page' => 10,
- 'max' => false
- );
-
- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
-
- $posts_template = new BP_Blogs_Blog_Post_Template( $user_id, $per_page, $max );
- return apply_filters( 'bp_has_posts', $posts_template->has_posts(), &$posts_template );
-}
-
-function bp_posts() {
- global $posts_template;
- return $posts_template->user_posts();
-}
-
-function bp_the_post() {
- global $posts_template;
- return $posts_template->the_post();
-}
-
-function bp_post_pagination_count() {
- global $bp, $posts_template;
-
- $from_num = bp_core_number_format( intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1 );
- $to_num = bp_core_number_format( ( $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 %s to %s (of %s posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?> &nbsp;
- <span class="ajax-loader"></span><?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;
- return apply_filters( 'bp_get_post_id', $posts_template->post->ID );
- }
-
-function bp_post_title( $deprecated = true ) {
- if ( !$deprecated )
- bp_get_post_title();
- else
- 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 bp_post_get_permalink();
-}
-
-function bp_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() {
- 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() {
- 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 ( !$deprecated )
- return bp_get_post_date( $date_format );
- else
- 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() {
- 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' ) {
- global $posts_template, $wpdb;
-
- $number = (int)$posts_template->post->comment_count;
-
- if ( 0 == $number && 'closed' == $posts_template->postcomment_status && 'closed' == $posts_template->postping_status ) {
- echo '<span' . ((!empty($css_class)) ? ' class="' . $css_class . '"' : '') . '>' . $none . '</span>';
- return;
- }
-
- if ( !empty($posts_template->postpost_password) ) { // if there's a password
- if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) || $_COOKIE['wp-postpass_' . COOKIEHASH] != $posts_template->postpost_password ) { // and it doesn't match the cookie
- echo __('Enter your password to view comments', 'buddypress');
- return;
- }
- }
-
- echo '<a href="';
-
- if ( 0 == $number )
- echo bp_post_get_permalink() . '#respond';
- else
- echo bp_post_get_permalink() . '#comments';
- echo '"';
-
- if ( !empty( $css_class ) ) {
- echo ' class="'.$css_class.'" ';
- }
- $title = attribute_escape( $posts_template->post->post_title );
-
- echo apply_filters( 'comments_popup_link_attributes', '' );
-
- echo ' title="' . sprintf( __('Comment on %s', 'buddypress'), $title ) . '">';
-
- if ( 1 == $number )
- printf( __( '%d Comment', 'buddypress' ), $number );
- else
- printf( __( '%d Comments', 'buddypress' ), $number );
-
- echo '</a>';
-}
-
-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 ( !$deprecated )
- return bp_get_post_category( $separator, $parents, $post_id );
- else
- 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 = '' ) {
- global $posts_template, $wpdb;
-
- /* Disabling this for now as it's too expensive and there is no global tags directory */
- return false;
-
- switch_to_blog( $posts_template->post->blog_id );
- $terms = bp_post_get_term_list( $before, $sep, $after );
- restore_current_blog();
-}
-
-function bp_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() {
- 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;
-
- if ( !$post )
- $post = $posts_template->post;
-
- if ( !$blog_id )
- $blog_id = $posts_template->post->blog_id;
-
- if ( !$post || !$blog_id )
- return false;
-
- $rewritecode = array(
- '%year%',
- '%monthnum%',
- '%day%',
- '%hour%',
- '%minute%',
- '%second%',
- $leavename? '' : '%postname%',
- '%post_id%',
- '%category%',
- '%author%',
- $leavename? '' : '%pagename%',
- );
-
- if ( 'page' == $post->post_type )
- return get_page_link($post->ID, $leavename);
- else if ( 'attachment' == $post->post_type )
- return get_attachment_link($post->ID);
-
- $permalink = get_blog_option( $blog_id, 'permalink_structure' );
- $site_url = get_blog_option( $blog_id, 'siteurl' );
-
- if ( '' != $permalink && !in_array($post->post_status, array('draft', 'pending')) ) {
- $unixtime = strtotime($post->post_date);
-
- $category = '';
- if ( false !== strpos($permalink, '%category%') ) {
- $cats = get_the_category($post->ID);
- if ( $cats )
- usort($cats, '_usort_terms_by_ID'); // order by ID
- $category = $cats[0]->slug;
- if ( $parent=$cats[0]->parent )
- $category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
-
- // show default category in permalinks, without
- // having to assign it explicitly
- if ( empty($category) ) {
- $default_category = get_category( get_option( 'default_category' ) );
- $category = is_wp_error( $default_category ) ? '' : $default_category->slug;
- }
- }
-
- $author = '';
- if ( false !== strpos($permalink, '%author%') ) {
- $authordata = get_userdata($post->post_author);
- $author = $authordata->user_nicename;
- }
-
- $date = explode(" ",date('Y m d H i s', $unixtime));
- $rewritereplace =
- array(
- $date[0],
- $date[1],
- $date[2],
- $date[3],
- $date[4],
- $date[5],
- $post->post_name,
- $post->ID,
- $category,
- $author,
- $post->post_name,
- );
- $permalink = $site_url . str_replace($rewritecode, $rewritereplace, $permalink);
- $permalink = user_trailingslashit($permalink, 'single');
- return apply_filters('post_link', $permalink, $post);
- } else { // if they're not using the fancy permalink option
- $permalink = $site_url . '/?p=' . $post->ID;
- return apply_filters('post_link', $permalink, $post);
- }
-}
-
-function bp_post_get_term_list( $before = '', $sep = '', $after = '' ) {
- global $posts_template;
-
- $terms = get_the_terms( $posts_template->post->ID, 'post_tag' );
-
- if ( is_wp_error($terms) )
- return $terms;
-
- if ( empty( $terms ) )
- return false;
-
- foreach ( (array)$terms as $term ) {
- $link = get_blog_option( BP_ROOT_BLOG, 'siteurl') . '/tag/' . $term->slug;
- $link = apply_filters('term_link', $link);
-
- $term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>';
- }
-
- $term_links = apply_filters( "term_links-$taxonomy", $term_links );
-
- echo $before . join($sep, $term_links) . $after;
-}
-
-
-/**********************************************************************
- * User Blog Comments listing template class
- */
-
-class BP_Blogs_Post_Comment_Template {
- var $current_comment = -1;
- var $comment_count;
- var $comments;
- var $comment;
-
- var $in_the_loop;
-
- var $pag_page;
- var $pag_num;
- var $pag_links;
- var $total_comment_count;
-
- function bp_blogs_post_comment_template( $user_id, $per_page, $max ) {
- global $bp;
-
- if ( !$user_id )
- $user_id = $bp->displayed_user->id;
-
- $this->pag_page = isset( $_GET['compage'] ) ? intval( $_GET['compage'] ) : 1;
- $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-
- if ( !$this->comments = wp_cache_get( 'bp_user_comments_' . $user_id, 'bp' ) ) {
- $this->comments = bp_blogs_get_comments_for_user( $user_id );
- wp_cache_set( 'bp_user_comments_' . $user_id, $this->comments, 'bp' );
- }
-
- if ( !$max || $max >= (int)$this->comments['count'] )
- $this->total_comment_count = (int)$this->comments['count'];
- else
- $this->total_comment_count = (int)$max;
-
- $this->comments = array_slice( (array)$this->comments['comments'], intval( ( $this->pag_page - 1 ) * $this->pag_num), intval( $this->pag_num ) );
-
- if ( $max ) {
- if ( $max >= count($this->comments) )
- $this->comment_count = count($this->comments);
- else
- $this->comment_count = (int)$max;
- } else {
- $this->comment_count = count($this->comments);
- }
-
- $this->pag_links = paginate_links( array(
- 'base' => add_query_arg( 'compage', '%#%' ),
- 'format' => '',
- 'total' => ceil($this->total_comment_count / $this->pag_num),
- 'current' => $this->pag_page,
- 'prev_text' => '&laquo;',
- 'next_text' => '&raquo;',
- 'mid_size' => 1
- ));
-
- }
-
- function has_comments() {
- if ( $this->comment_count )
- return true;
-
- return false;
- }
-
- function next_comment() {
- $this->current_comment++;
- $this->comment = $this->comments[$this->current_comment];
-
- return $this->comment;
- }
-
- function rewind_comments() {
- $this->current_comment = -1;
- if ( $this->comment_count > 0 ) {
- $this->comment = $this->comments[0];
- }
- }
-
- function user_comments() {
- if ( $this->current_comment + 1 < $this->comment_count ) {
- return true;
- } elseif ( $this->current_comment + 1 == $this->comment_count ) {
- do_action('loop_end');
- // Do some cleaning up after the loop
- $this->rewind_comments();
- }
-
- $this->in_the_loop = false;
- return false;
- }
-
- function the_comment() {
- global $comment;
-
- $this->in_the_loop = true;
- $comment = $this->next_comment();
-
- if ( 0 == $this->current_comment ) // loop has just started
- do_action('loop_start');
- }
-}
-
-function bp_has_comments( $args = '' ) {
- global $comments_template;
-
- $defaults = array(
- 'user_id' => false,
- 'per_page' => 10,
- 'max' => false
- );
-
- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
-
- $comments_template = new BP_Blogs_Post_Comment_Template( $user_id, $per_page, $max );
- return apply_filters( 'bp_has_comments', $comments_template->has_comments(), &$comments_template );
-}
-
-function bp_comments() {
- global $comments_template;
- return $comments_template->user_comments();
-}
-
-function bp_the_comment() {
- global $comments_template;
- return $comments_template->the_comment();
-}
-
-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;
-
- if ( !$deprecated )
- return bp_get_comment_author();
- else
- 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() {
- 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 ( !$deprecated )
- return bp_get_comment_date( $date_format );
- else
- 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 ( !$deprecated )
- return bp_get_comment_blog_permalink();
- else
- 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' ) );
- }
-
-
</del><span class="cx"> /* Blog registration template tags */
</span><span class="cx">
</span><span class="cx"> function bp_blog_signup_enabled() {
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-blogs.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> function bp_blogs_check_installed() {
</span><span class="cx"> global $wpdb, $bp, $userdata;
</span><span class="cx">
</span><ins>+ /* Only create the bp-blogs tables if this is a multisite install */
</ins><span class="cx"> if ( is_site_admin() && bp_core_is_multisite() ) {
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><span class="cx"> if ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )
</span><span class="lines">@@ -797,26 +798,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * bp_blogs_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function bp_blogs_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
-
- add_filter( 'bp_blogs_template_directory_blogs_setup', create_function( '', 'return "directories/blogs/index";' ) );
- add_filter( 'bp_blogs_template_my_blogs', create_function( '', 'return "blogs/my-blogs";' ) );
- add_filter( 'bp_blogs_template_recent_posts', create_function( '', 'return "blogs/recent-posts";' ) );
- add_filter( 'bp_blogs_template_recent_comments', create_function( '', 'return "blogs/recent-comments";' ) );
- add_filter( 'bp_blogs_template_create_a_blog', create_function( '', 'return "blogs/create";' ) );
-}
-add_action( 'init', 'bp_blogs_filter_template_paths' );
-
</del><span class="cx"> function bp_blogs_remove_data( $user_id ) {
</span><span class="cx"> /* If this is regular blog, delete all data for that blog. */
</span><span class="cx"> BP_Blogs_Blog::delete_blogs_for_user( $user_id );
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-core.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -1907,23 +1907,6 @@
</span><span class="cx"> add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_core_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function bp_core_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
-
- add_filter( 'bp_core_template_directory_members', create_function( '', 'return "directories/members/index";' ) );
- add_filter( 'bp_core_template_plugin', create_function( '', 'return "plugin-template";' ) );
-}
-add_action( 'init', 'bp_core_filter_template_paths' );
-
-/**
</del><span class="cx"> * bp_core_filter_parent_theme()
</span><span class="cx"> *
</span><span class="cx"> * Remove social network parent theme from the theme list.
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-forums.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -520,23 +520,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'user_has_cap', 'bp_forums_filter_caps' );
</span><span class="cx">
</span><del>-/**
- * bp_forums_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function bp_forums_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
</del><span class="cx">
</span><del>- add_filter( 'bp_forums_template_directory_forums_setup', create_function( '', 'return "directories/forums/index";' ) );
-}
-add_action( 'init', 'bp_forums_filter_template_paths' );
-
-
</del><span class="cx"> /********************************************************************************
</span><span class="cx"> * Caching
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-friends.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -593,23 +593,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * friends_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function friends_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
-
- add_filter( 'friends_template_my_friends', create_function( '', 'return "friends/index";' ) );
- add_filter( 'friends_template_requests', create_function( '', 'return "friends/requests";' ) );
-}
-add_action( 'init', 'friends_filter_template_paths' );
-
</del><span class="cx"> function friends_remove_data( $user_id ) {
</span><span class="cx"> BP_Friends_Friendship::delete_all_for_user($user_id);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-groups.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -2525,37 +2525,6 @@
</span><span class="cx">
</span><span class="cx"> /*** Group Cleanup Functions ****************************************************/
</span><span class="cx">
</span><del>-/**
- * groups_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function groups_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
-
- add_filter( 'groups_template_directory_groups', create_function( '', 'return "directories/groups/index";' ) );
- add_filter( 'groups_template_my_groups', create_function( '', 'return "groups/index";' ) );
- add_filter( 'groups_template_group_invites', create_function( '', 'return "groups/invites";' ) );
- add_filter( 'groups_template_group_admin', create_function( '', 'return "groups/single/admin";' ) );
- add_filter( 'groups_template_group_forum_topic_edit', create_function( '', 'return "groups/single/forum/edit";' ) );
- add_filter( 'groups_template_group_forum_topic', create_function( '', 'return "groups/single/forum/topic";' ) );
- add_filter( 'groups_template_group_forum', create_function( '', 'return "groups/single/forum/index";' ) );
- add_filter( 'groups_template_group_leave', create_function( '', 'return "groups/single/leave-confirm";' ) );
- add_filter( 'groups_template_group_request_membership', create_function( '', 'return "groups/single/request-membership";' ) );
- add_filter( 'groups_template_group_invite', create_function( '', 'return "groups/single/send-invite";' ) );
- add_filter( 'groups_template_group_members', create_function( '', 'return "groups/single/members";' ) );
- add_filter( 'groups_template_group_admin_settings', create_function( '', 'return "groups/single/admin";' ) );
- add_filter( 'groups_template_group_admin_avatar', create_function( '', 'return "groups/single/admin";' ) );
- add_filter( 'groups_template_group_admin_manage_members', create_function( '', 'return "groups/single/admin";' ) );
- add_filter( 'groups_template_group_admin_requests', create_function( '', 'return "groups/single/admin";' ) );
- add_filter( 'groups_template_group_admin_delete_group', create_function( '', 'return "groups/single/admin";' ) );
-}
-add_action( 'init', 'groups_filter_template_paths' );
-
</del><span class="cx"> function groups_remove_data_for_user( $user_id ) {
</span><span class="cx"> BP_Groups_Member::delete_all_for_user($user_id);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-messages.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -570,27 +570,7 @@
</span><span class="cx"> return BP_Messages_Thread::is_valid( $thread_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * messages_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function messages_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
</del><span class="cx">
</span><del>- add_filter( 'messages_template_compose', create_function( '', 'return "messages/compose";' ) );
- add_filter( 'messages_template_sentbox', create_function( '', 'return "messages/sentbox";' ) );
- add_filter( 'messages_template_inbox', create_function( '', 'return "messages/index";' ) );
- add_filter( 'messages_template_notices', create_function( '', 'return "messages/notices";' ) );
- add_filter( 'messages_template_view_message', create_function( '', 'return "messages/view";' ) );
-}
-add_action( 'init', 'messages_filter_template_paths' );
-
-
</del><span class="cx"> /********************************************************************************
</span><span class="cx"> * Caching
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -766,7 +766,7 @@
</span><span class="cx"> width: 90%;
</span><span class="cx"> }
</span><span class="cx"> form.standard-form#signup_form div.submit { float: right; }
</span><del>- form.standard-form#signup_form div.signup-avatar { margin-right: 15px; }
</del><ins>+ div#signup-avatar img { margin: 0 15px 10px 0; }
</ins><span class="cx">
</span><span class="cx"> form.standard-form textarea {
</span><span class="cx"> width: 75%;
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2677 => 2678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-02-11 15:06:19 UTC (rev 2677)
+++ trunk/bp-xprofile.php 2010-02-11 15:48:07 UTC (rev 2678)
</span><span class="lines">@@ -907,24 +907,7 @@
</span><span class="cx"> add_action( 'bp_activity_screen_my_activity', 'xprofile_remove_screen_notifications' );
</span><span class="cx"> add_action( 'bp_activity_screen_single_activity_permalink', 'xprofile_remove_screen_notifications' );
</span><span class="cx">
</span><del>-/**
- * xprofile_filter_template_paths()
- *
- * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
- * older than 1.2.
- *
- * @package BuddyPress Core
- */
-function xprofile_filter_template_paths() {
- if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- return false;
</del><span class="cx">
</span><del>- add_filter( 'xprofile_template_display_profile', create_function( '', 'return "profile/index";' ) );
- add_filter( 'xprofile_template_edit_profile', create_function( '', 'return "profile/edit";' ) );
- add_filter( 'xprofile_template_change_avatar', create_function( '', 'return "profile/change-avatar";' ) );
-}
-add_action( 'init', 'xprofile_filter_template_paths' );
-
</del><span class="cx"> /**
</span><span class="cx"> * xprofile_remove_data_on_user_deletion()
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>