<!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][3610] trunk: Changes bp_create_excerpt() so that excerpts are generated using character counts rather than word counts.</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>3610</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-29 15:22:44 +0000 (Wed, 29 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Changes bp_create_excerpt() so that excerpts are generated using character counts rather than word counts. Modifies excerpt_length throughout BP to account for the change. Fixes #1222</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatetagsphp">trunk/bp-messages/bp-messages-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3609 => 3610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-12-28 22:08:23 UTC (rev 3609)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-12-29 15:22:44 UTC (rev 3610)
</span><span class="lines">@@ -862,7 +862,7 @@
</span><span class="cx"> if ( !$update = get_user_meta( $user_id, 'bp_latest_update', true ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $latest_update = '&quot;' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '&quot;';
</del><ins>+ $latest_update = '&quot;' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 180 ) ) ) ) . '&quot;';
</ins><span class="cx"> $latest_update .= ' &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $update['id'] . '/"> ' . __( 'View', 'buddypress' ) . '</a>';
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activity_latest_update', $latest_update );
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> $title = substr( $title, 0, -1 );
</span><span class="cx">
</span><span class="cx"> if ( 'activity_update' == $activities_template->activity->type )
</span><del>- $title .= ': ' . strip_tags( bp_create_excerpt( $activities_template->activity->content, 15 ) );
</del><ins>+ $title .= ': ' . strip_tags( bp_create_excerpt( $activities_template->activity->content, 70 ) );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activity_feed_item_title', $title );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3609 => 3610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-12-28 22:08:23 UTC (rev 3609)
+++ trunk/bp-core/bp-core-templatetags.php 2010-12-29 15:22:44 UTC (rev 3610)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> global $members_template, $bp;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'length' => 15
</del><ins>+ 'length' => 70
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -1115,26 +1115,20 @@
</span><span class="cx"> * @uses $excerpt_length The maximum length in characters of the excerpt.
</span><span class="cx"> * @return str The excerpt text
</span><span class="cx"> */
</span><del>-function bp_create_excerpt( $text, $excerpt_length = 55, $filter_shortcodes = true ) { // Fakes an excerpt if needed
</del><ins>+function bp_create_excerpt( $text, $excerpt_length = 225, $filter_shortcodes = true ) { // Fakes an excerpt if needed
</ins><span class="cx"> $original_text = $text;
</span><span class="cx"> $text = str_replace(']]>', ']]&gt;', $text);
</span><span class="cx">
</span><span class="cx"> if ( $filter_shortcodes )
</span><span class="cx"> $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
</span><span class="cx">
</span><del>- $words = preg_split(
- "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s",
- $text,
- $excerpt_length + 1,
- PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE
- );
-
- if (count($words) > $excerpt_length) {
- array_pop($words);
- array_push($words, '[...]');
- $text = implode(' ', $words);
</del><ins>+ preg_match( "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s", $text, $matches, PREG_OFFSET_CAPTURE, $excerpt_length );
+
+ if ( !empty( $matches ) ) {
+ $pos = array_pop( array_pop( $matches ) );
+ $text = substr( $text, 0, $pos ) . ' [...]';
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_create_excerpt', $text, $original_text );
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (3609 => 3610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-12-28 22:08:23 UTC (rev 3609)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-12-29 15:22:44 UTC (rev 3610)
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> global $forum_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'length' => 10
</del><ins>+ 'length' => 45
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (3609 => 3610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php 2010-12-28 22:08:23 UTC (rev 3609)
+++ trunk/bp-messages/bp-messages-templatetags.php 2010-12-29 15:22:44 UTC (rev 3610)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> function bp_get_message_thread_excerpt() {
</span><span class="cx"> global $messages_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 10 ) ) );
</del><ins>+ return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 75 ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_message_thread_from() {
</span></span></pre>
</div>
</div>
</body>
</html>