<!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] [2684] trunk:
Remove forced blockquote tags on activity entries for blogs and forums.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2684</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-11 17:20:11 +0000 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove forced blockquote tags on activity entries for blogs and forums.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2683 => 2684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-02-11 17:17:02 UTC (rev 2683)
+++ trunk/bp-blogs.php 2010-02-11 17:20:11 UTC (rev 2684)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> $action = apply_filters( 'bp_blogs_record_activity_action', $action );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $content ) )
</span><del>- $content = apply_filters( 'bp_blogs_record_activity_content', "<blockquote>" . bp_create_excerpt( $content ) . "</blockquote>" );
</del><ins>+ $content = apply_filters( 'bp_blogs_record_activity_content', bp_create_excerpt( $content ) );
</ins><span class="cx">
</span><span class="cx"> /* Check for an existing entry and update if one exists. */
</span><span class="cx"> $id = bp_activity_get_activity_id( array(
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2683 => 2684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-02-11 17:17:02 UTC (rev 2683)
+++ trunk/bp-groups.php 2010-02-11 17:20:11 UTC (rev 2684)
</span><span class="lines">@@ -1942,7 +1942,7 @@
</span><span class="cx"> $topic = bp_forums_get_topic_details( $topic_id );
</span><span class="cx">
</span><span class="cx"> $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
</span><del>- $activity_content = '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
</del><ins>+ $activity_content = bp_create_excerpt( $post_text );
</ins><span class="cx"> $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
</span><span class="cx">
</span><span class="cx"> if ( $page )
</span><span class="lines">@@ -1981,7 +1981,7 @@
</span><span class="cx"> $topic = bp_forums_get_topic_details( $topic_id );
</span><span class="cx">
</span><span class="cx"> $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
</span><del>- $activity_content = '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
</del><ins>+ $activity_content = bp_create_excerpt( $topic_text );
</ins><span class="cx">
</span><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> groups_record_activity( array(
</span><span class="lines">@@ -2013,7 +2013,7 @@
</span><span class="cx"> bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
</span><span class="cx">
</span><span class="cx"> $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
</span><del>- $activity_content = '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
</del><ins>+ $activity_content = bp_create_excerpt( $topic_text );
</ins><span class="cx">
</span><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> groups_record_activity( array(
</span><span class="lines">@@ -2047,7 +2047,7 @@
</span><span class="cx"> $topic = bp_forums_get_topic_details( $topic_id );
</span><span class="cx">
</span><span class="cx"> $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
</span><del>- $activity_content = '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
</del><ins>+ $activity_content = bp_create_excerpt( $post_text );
</ins><span class="cx"> $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
</span><span class="cx">
</span><span class="cx"> if ( $page )
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2683 => 2684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-11 17:17:02 UTC (rev 2683)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-11 17:20:11 UTC (rev 2684)
</span><span class="lines">@@ -1194,6 +1194,7 @@
</span><span class="cx">
</span><span class="cx"> /* Backwards compatibility. */
</span><span class="cx"> .activity-inner > .activity-inner { margin: 0 !important; }
</span><ins>+ .activity-inner > blockquote { margin: 0 !important; }
</ins><span class="cx">
</span><span class="cx"> .activity-list .activity-content img.thumbnail {
</span><span class="cx"> float: left;
</span></span></pre>
</div>
</div>
</body>
</html>