<!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" />
<title>[BuddyPress][5030] trunk: Cleans up use of bp_create_excerpt().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5030">5030</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-08-24 19:18:57 +0000 (Wed, 24 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleans up use of bp_create_excerpt(). Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3503">#3503</a>. Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersmembersloopphp">trunk/bp-themes/bp-default/members/members-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (5029 => 5030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-08-24 16:30:57 UTC (rev 5029)
+++ trunk/bp-core/bp-core-template.php 2011-08-24 19:18:57 UTC (rev 5030)
</span><span class="lines">@@ -482,8 +482,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_create_excerpt', $truncate, $original_text, $length, $options );
</span><ins>+
</ins><span class="cx"> }
</span><del>-add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
</del><span class="cx"> add_filter( 'bp_create_excerpt', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_create_excerpt', 'force_balance_tags' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (5029 => 5030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-08-24 16:30:57 UTC (rev 5029)
+++ trunk/bp-forums/bp-forums-template.php 2011-08-24 19:18:57 UTC (rev 5030)
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> global $forum_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'length' => 45
</del><ins>+ 'length' => 225
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -731,12 +731,11 @@
</span><span class="cx">
</span><span class="cx"> $post = bp_forums_get_post( $forum_template->topic->topic_last_post_id );
</span><span class="cx"> $post = bp_create_excerpt( $post->post_text, $length );
</span><del>- return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post );
</del><ins>+
+ return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post, $length );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_time_since_last_post() {
</span><del>- global $forum_template;
-
</del><span class="cx"> echo bp_get_the_topic_time_since_last_post();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_the_topic_time_since_last_post() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5029 => 5030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-08-24 16:30:57 UTC (rev 5029)
+++ trunk/bp-groups/bp-groups-template.php 2011-08-24 19:18:57 UTC (rev 5030)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> if ( !$group )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) );
</del><ins>+ return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (5029 => 5030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-08-24 16:30:57 UTC (rev 5029)
+++ trunk/bp-members/bp-members-template.php 2011-08-24 19:18:57 UTC (rev 5030)
</span><span class="lines">@@ -570,21 +570,26 @@
</span><span class="cx"> global $bp, $members_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'length' => 70,
</del><ins>+ 'length' => 225,
</ins><span class="cx"> 'view_link' => true
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r, EXTR_SKIP );
</del><ins>+ extract( $r );
</ins><span class="cx">
</span><del>- if ( !isset( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
</del><ins>+ if ( empty( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- $update_content = apply_filters( 'bp_get_activity_latest_update', sprintf( _x( '- &quot;%s&quot;', 'member latest update in member directory', 'buddypress' ), trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) ) );
</del><ins>+ $update_content = apply_filters( 'bp_get_activity_latest_update_excerpt', sprintf( _x( '- &quot;%s &quot;', 'member latest update in member directory', 'buddypress' ), trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) ) );
</ins><span class="cx">
</span><del>- if ( $view_link && !empty( $update['id'] ) && bp_is_active( 'activity' ) )
- $update_content .= ' <a href="' . bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
</del><ins>+ // If $view_link is true and the text returned by bp_create_excerpt() is different from the original text (ie it's
+ // been truncated), add the "View" link.
+ if ( $view_link && ( $update_content != $update['content'] ) ) {
+ $view = __( 'View', 'buddypress' );
</ins><span class="cx">
</span><ins>+ $update_content .= '<span class="activity-read-more"><a href="' . bp_activity_get_permalink( $update['id'] ) . '" rel="nofollow">' . $view . '</a></span>';
+ }
+
</ins><span class="cx"> return apply_filters( 'bp_get_member_latest_update', $update_content );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersmembersloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/members-loop.php (5029 => 5030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/members-loop.php 2011-08-24 16:30:57 UTC (rev 5029)
+++ trunk/bp-themes/bp-default/members/members-loop.php 2011-08-24 19:18:57 UTC (rev 5030)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_member_latest_update() ) : ?>
</span><span class="cx">
</span><del>- <span class="update"> <?php bp_member_latest_update( array( 'length' => 10, 'view_link' => false ) ); ?></span>
</del><ins>+ <span class="update"> <?php bp_member_latest_update(); ?></span>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>