<!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>[28586] trunk/src/wp-includes/default-widgets.php: Clean up wp_widget_rss_output():</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28586">28586</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-05-27 11:07:32 +0000 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up wp_widget_rss_output():
* Fix appending […] to $summary.
* Use wp_trim_words() instead of wp_html_excerpt().
* Trim $title before checking if it's empty. props UmeshSingla.
* Use correct escaping function for $title.
fixes <a href="http://core.trac.wordpress.org/ticket/28356">#28356</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultwidgetsphp">trunk/src/wp-includes/default-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-widgets.php (28585 => 28586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-widgets.php 2014-05-27 10:54:54 UTC (rev 28585)
+++ trunk/src/wp-includes/default-widgets.php 2014-05-27 11:07:32 UTC (rev 28586)
</span><span class="lines">@@ -1034,29 +1034,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo '<ul>';
</span><del>- foreach ( $rss->get_items(0, $items) as $item ) {
</del><ins>+ foreach ( $rss->get_items( 0, $items ) as $item ) {
</ins><span class="cx"> $link = $item->get_link();
</span><del>- while ( stristr($link, 'http') != $link )
- $link = substr($link, 1);
- $link = esc_url(strip_tags($link));
- $title = esc_attr(strip_tags($item->get_title()));
- if ( empty($title) )
- $title = __('Untitled');
</del><ins>+ while ( stristr( $link, 'http' ) != $link ) {
+ $link = substr( $link, 1 );
+ }
+ $link = esc_url( strip_tags( $link ) );
</ins><span class="cx">
</span><ins>+ $title = esc_html( trim( strip_tags( $item->get_title() ) ) );
+ if ( empty( $title ) ) {
+ $title = __( 'Untitled' );
+ }
+
</ins><span class="cx"> $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
</span><del>- $desc = esc_attr( strip_tags( $desc ) );
- $desc = trim( str_replace( array( "\n", "\r" ), ' ', $desc ) );
- $desc = wp_html_excerpt( $desc, 360 );
</del><ins>+ $desc = esc_attr( wp_trim_words( $desc, 55, ' […]' ) );
</ins><span class="cx">
</span><span class="cx"> $summary = '';
</span><span class="cx"> if ( $show_summary ) {
</span><span class="cx"> $summary = $desc;
</span><span class="cx">
</span><del>- // Append ellipsis. Change existing [...] to […].
</del><ins>+ // Change existing [...] to […].
</ins><span class="cx"> if ( '[...]' == substr( $summary, -5 ) ) {
</span><span class="cx"> $summary = substr( $summary, 0, -5 ) . '[…]';
</span><del>- } elseif ( '[…]' != substr( $summary, -10 ) && $desc !== $summary ) {
- $summary .= ' […]';
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
</span></span></pre>
</div>
</div>
</body>
</html>