<!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>[13328] trunk/wp-includes/default-widgets.php: Don'
t show two ellipses in wp_widget_rss_output().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13328">13328</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-23 10:30:21 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't show two ellipses in wp_widget_rss_output(). Fixes <a href="http://trac.wordpress.org/ticket/11244">#11244</a> props miqrogroove</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13327 => 13328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-02-23 09:44:27 UTC (rev 13327)
+++ trunk/wp-includes/default-widgets.php 2010-02-23 10:30:21 UTC (rev 13328)
</span><span class="lines">@@ -805,8 +805,15 @@
</span><span class="cx"> if ( empty($title) )
</span><span class="cx"> $title = __('Untitled');
</span><span class="cx">
</span><del>- $desc = str_replace(array("\n", "\r"), ' ', esc_attr(strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
- $desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]';
</del><ins>+ $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
+ $desc = wp_html_excerpt( $desc, 360 );
+
+ // Append ellipsis. Change existing [...] to [&hellip;].
+ if ( '[...]' == substr( $desc, -5 ) )
+ $desc = substr( $desc, 0, -5 ) . '[&hellip;]';
+ elseif ( '[&hellip;]' != substr( $desc, -10 ) )
+ $desc .= ' [&hellip;]';
+
</ins><span class="cx"> $desc = esc_html( $desc );
</span><span class="cx">
</span><span class="cx"> if ( $show_summary ) {
</span></span></pre>
</div>
</div>
</body>
</html>