<!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>[3931] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php: Profiles Activity Notifier: Improve reply excerpt generation.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3931">3931</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3931","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-02 20:59:31 +0000 (Fri, 02 Sep 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Profiles Activity Notifier: Improve reply excerpt generation.
* Use newly introduced `get_reply_excerpt()` instead of `bbp_get_reply_excerpt()`.
* Strip all blockquoted text from excerpts since that text is not original to the reply.
* Trim reply excerpts by words (15) instead of by characters.
* Add `trim_text()` to handle trimming text by words or by characters.
* If trimming by characters, honor requested excerpt length for multibyte strings.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1953">#1953</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgprofileswpactivitynotifierwporgprofileswpactivitynotifierphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgprofileswpactivitynotifierwporgprofileswpactivitynotifierphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php 2016-09-02 20:11:53 UTC (rev 3930)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php 2016-09-02 20:59:31 UTC (rev 3931)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'forum_id' => bbp_get_reply_forum_id( $reply_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => bbp_get_reply_topic_title( $reply_id ) ,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => bbp_get_reply_url( $reply_id ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message' => bbp_get_reply_excerpt( $reply_id, 55 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => $this->get_reply_excerpt( $reply_id, 15 ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'site' => get_bloginfo( 'name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_url' => site_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,6 +334,75 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_notify_forum_reply_payload( 'remove-reply', $reply_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Returns the excerpt of the reply.
+ *
+ * This is similar to `bbp_get_reply_excerpt()` except:
+ *
+ * - Excerpt length is by number of words and not number of characters.
+ * - Omits inclusion of any blockquoted text.
+ *
+ * @param int $reply_id Optional. The reply id.
+ * @param int $words Optional. The number of words for the excerpt. Default 15.
+ * @return string
+ */
+ public function get_reply_excerpt( $reply_id = 0, $words = 15 ) {
+ $reply_id = bbp_get_reply_id( $reply_id );
+ $excerpt = get_post_field( 'post_excerpt', $reply_id );
+
+ if ( ! $excerpt ) {
+ $excerpt = bbp_get_reply_content( $reply_id );
+ }
+
+ $excerpt = $this->trim_text( $excerpt, $words, 'words' );
+ return apply_filters( 'bbp_get_reply_excerpt', $excerpt, $reply_id, $words );
+ }
+
+ /**
+ * Trims text by words or characters.
+ *
+ * @param string $text The text to trim.
+ * @param int $length Optional. The number of words or characters to try down to. Default 15.
+ * @param string $trim_style Optional. The manner in which the text should be trimmed. Either 'chars' or 'words'. Default 'words'.
+ * @return string
+ */
+ public function trim_text( $text, $length = 15, $trim_style = 'words' ) {
+ $length = (int) $length;
+ $trim_style = in_array( $trim_style, array( 'chars', 'words' ) ) ? $trim_style : 'words';
+
+ // Remove blockquoted text since the text isn't original.
+ $text = preg_replace( '/<blockquote>.+<\/blockquote>/', '', $text );
+
+ // Strip tags and surrounding whitespace.
+ $text = trim ( strip_tags( $text ) );
+
+ // If trimming by chars, behave like a more multibyte-aware
+ // bbp_get_reply_excerp().
+ if ( 'chars' === $trim_style ) {
+ // Multibyte support
+ if ( function_exists( 'mb_strlen' ) ) {
+ $text_length = mb_strlen( $text );
+ } else {
+ $text_length = strlen( $text );
+ }
+
+ if ( $length && ( $text_length > $length ) ) {
+ if ( function_exists( 'mb_strlen' ) ) {
+ $text = mb_substr( $text, 0, $length - 1 );
+ } else {
+ $text = substr( $text, 0, $length - 1 );
+ }
+ $text .= '…';
+ }
+ }
+ // Else trim by words.
+ else {
+ $text = wp_trim_words( $text, $length );
+ }
+
+ return $text;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> new WPOrg_WP_Activity_Notifier();
</span></span></pre>
</div>
</div>
</body>
</html>