<!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>[24207] trunk: Use ellipsis instead of three dots.</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/24207">24207</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-05-08 21:27:31 +0000 (Wed, 08 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use ellipsis instead of three dots. props tjsingleton, jordie23, wojtek.szkutnik, DrewAPicture, SergeyBiryukov. see <a href="http://core.trac.wordpress.org/ticket/8714">#8714</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludespostformatsphp">trunk/wp-includes/post-formats.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwptrackbackphp">trunk/wp-trackback.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/edit.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx">
</span><span class="cx"> if ( $post_del->post_type == 'attachment' ) {
</span><span class="cx"> if ( ! wp_delete_attachment($post_id) )
</span><del>- wp_die( __('Error in deleting...') );
</del><ins>+ wp_die( __('Error in deleting.') );
</ins><span class="cx"> } else {
</span><span class="cx"> if ( !wp_delete_post($post_id) )
</span><del>- wp_die( __('Error in deleting...') );
</del><ins>+ wp_die( __('Error in deleting.') );
</ins><span class="cx"> }
</span><span class="cx"> $deleted++;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> $author_url = '';
</span><span class="cx"> $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
</span><span class="cx"> if ( strlen( $author_url_display ) > 50 )
</span><del>- $author_url_display = substr( $author_url_display, 0, 49 ) . '...';
</del><ins>+ $author_url_display = substr( $author_url_display, 0, 49 ) . '…';
</ins><span class="cx">
</span><span class="cx"> echo "<strong>"; comment_author(); echo '</strong><br />';
</span><span class="cx"> if ( !empty( $author_url ) )
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/includes/dashboard.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx"> $publisher = "<strong>$publisher</strong>";
</span><span class="cx">
</span><span class="cx"> $content = $item->get_content();
</span><del>- $content = wp_html_excerpt($content, 50) . ' ...';
</del><ins>+ $content = wp_html_excerpt($content, 50) . ' …';
</ins><span class="cx">
</span><span class="cx"> if ( $link )
</span><span class="cx"> /* translators: incoming links feed, %1$s is other person, %3$s is content */
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/includes/misc.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> $short_url = str_replace( array( 'http://', 'www.' ), '', $url );
</span><span class="cx"> $short_url = untrailingslashit( $short_url );
</span><span class="cx"> if ( strlen( $short_url ) > 35 )
</span><del>- $short_url = substr( $short_url, 0, 32 ) . '...';
</del><ins>+ $short_url = substr( $short_url, 0, 32 ) . '…';
</ins><span class="cx"> return $short_url;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/press-this.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading...' ); ?></span></div>
</del><ins>+ <div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading…' ); ?></span></div>
</ins><span class="cx">
</span><span class="cx"> <div id="extra-fields" style="display: none"></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/theme-editor.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> $functions = wp_doc_link_parse( $content );
</span><span class="cx">
</span><span class="cx"> $docs_select = '<select name="docs-list" id="docs-list">';
</span><del>- $docs_select .= '<option value="">' . esc_attr__( 'Function Name...' ) . '</option>';
</del><ins>+ $docs_select .= '<option value="">' . esc_attr__( 'Function Name…' ) . '</option>';
</ins><span class="cx"> foreach ( $functions as $function ) {
</span><span class="cx"> $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-admin/upload.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> wp_die( __( 'You are not allowed to move this post to the trash.' ) );
</span><span class="cx">
</span><span class="cx"> if ( !wp_trash_post( $post_id ) )
</span><del>- wp_die( __( 'Error in moving to trash...' ) );
</del><ins>+ wp_die( __( 'Error in moving to trash.' ) );
</ins><span class="cx"> }
</span><span class="cx"> $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
</span><span class="cx"> break;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
</span><span class="cx">
</span><span class="cx"> if ( !wp_untrash_post( $post_id ) )
</span><del>- wp_die( __( 'Error in restoring from trash...' ) );
</del><ins>+ wp_die( __( 'Error in restoring from trash.' ) );
</ins><span class="cx"> }
</span><span class="cx"> $location = add_query_arg( 'untrashed', count( $post_ids ), $location );
</span><span class="cx"> break;
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> wp_die( __( 'You are not allowed to delete this post.' ) );
</span><span class="cx">
</span><span class="cx"> if ( !wp_delete_attachment( $post_id_del ) )
</span><del>- wp_die( __( 'Error in deleting...' ) );
</del><ins>+ wp_die( __( 'Error in deleting.' ) );
</ins><span class="cx"> }
</span><span class="cx"> $location = add_query_arg( 'deleted', count( $post_ids ), $location );
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -5422,7 +5422,7 @@
</span><span class="cx">
</span><span class="cx"> // prevent really long link text
</span><span class="cx"> if ( strlen($context[1]) > 100 )
</span><del>- $context[1] = substr($context[1], 0, 100) . '...';
</del><ins>+ $context[1] = substr($context[1], 0, 100) . '…';
</ins><span class="cx">
</span><span class="cx"> $marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker
</span><span class="cx"> $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
</span><span class="lines">@@ -5440,7 +5440,7 @@
</span><span class="cx">
</span><span class="cx"> $pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom);
</span><span class="cx">
</span><del>- $context = '[...] ' . esc_html( $excerpt ) . ' [...]';
</del><ins>+ $context = '[…] ' . esc_html( $excerpt ) . ' […]';
</ins><span class="cx"> $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );
</span><span class="cx">
</span><span class="cx"> $comment_post_ID = (int) $post_ID;
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/comment-template.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -393,8 +393,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the excerpt of the current comment.
</span><span class="cx"> *
</span><del>- * Will cut each word and only output the first 20 words with '...' at the end.
- * If the word count is less than 20, then no truncating is done and no '...'
</del><ins>+ * Will cut each word and only output the first 20 words with '…' at the end.
+ * If the word count is less than 20, then no truncating is done and no '…'
</ins><span class="cx"> * will appear.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> for ($i=0; $i<$k; $i++) {
</span><span class="cx"> $excerpt .= $blah[$i] . ' ';
</span><span class="cx"> }
</span><del>- $excerpt .= ($use_dotdotdot) ? '...' : '';
</del><ins>+ $excerpt .= ($use_dotdotdot) ? '…' : '';
</ins><span class="cx"> return apply_filters('get_comment_excerpt', $excerpt);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/comment.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -1753,7 +1753,7 @@
</span><span class="cx"> else
</span><span class="cx"> $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
</span><span class="cx"> $excerpt = str_replace(']]>', ']]>', $excerpt);
</span><del>- $excerpt = wp_html_excerpt($excerpt, 252) . '...';
</del><ins>+ $excerpt = wp_html_excerpt($excerpt, 252) . '…';
</ins><span class="cx">
</span><span class="cx"> $post_title = apply_filters('the_title', $post->post_title, $post->ID);
</span><span class="cx"> $post_title = strip_tags($post_title);
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/formatting.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -2161,11 +2161,11 @@
</span><span class="cx"> * Generates an excerpt from the content, if needed.
</span><span class="cx"> *
</span><span class="cx"> * The excerpt word amount will be 55 words and if the amount is greater than
</span><del>- * that, then the string ' [...]' will be appended to the excerpt. If the string
</del><ins>+ * that, then the string ' […]' will be appended to the excerpt. If the string
</ins><span class="cx"> * is less than 55 words, then the content will be returned as is.
</span><span class="cx"> *
</span><span class="cx"> * The 55 word limit can be modified by plugins/themes using the excerpt_length filter
</span><del>- * The ' [...]' string can be modified by plugins/themes using the excerpt_more filter
</del><ins>+ * The ' […]' string can be modified by plugins/themes using the excerpt_more filter
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><span class="lines">@@ -2182,7 +2182,7 @@
</span><span class="cx"> $text = apply_filters('the_content', $text);
</span><span class="cx"> $text = str_replace(']]>', ']]>', $text);
</span><span class="cx"> $excerpt_length = apply_filters('excerpt_length', 55);
</span><del>- $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
</del><ins>+ $excerpt_more = apply_filters('excerpt_more', ' ' . '[…]');
</ins><span class="cx"> $text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
</span><span class="cx"> }
</span><span class="cx"> return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/post-formats.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> $post = get_post();
</span><span class="cx">
</span><span class="cx"> if ( null === $more_link_text )
</span><del>- $more_link_text = __( '(more...)' );
</del><ins>+ $more_link_text = __( '(more…)' );
</ins><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> $has_teaser = false;
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/post-template.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> $post = get_post();
</span><span class="cx">
</span><span class="cx"> if ( null === $more_link_text )
</span><del>- $more_link_text = __( '(more...)' );
</del><ins>+ $more_link_text = __( '(more…)' );
</ins><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> $has_teaser = false;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-includes/post.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -3339,7 +3339,7 @@
</span><span class="cx"> $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content);
</span><span class="cx">
</span><span class="cx"> if (strlen($excerpt) > 255) {
</span><del>- $excerpt = substr($excerpt,0,252) . '...';
</del><ins>+ $excerpt = substr($excerpt,0,252) . '…';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $trackback_urls = explode(',', $tb_list);
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-login.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> $message = apply_filters('retrieve_password_message', $message, $key);
</span><span class="cx">
</span><span class="cx"> if ( $message && !wp_mail($user_email, $title, $message) )
</span><del>- wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
</del><ins>+ wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> $user_pass = wp_generate_password( 12, false);
</span><span class="cx"> $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
</span><span class="cx"> if ( ! $user_id ) {
</span><del>- $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
</del><ins>+ $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
</ins><span class="cx"> return $errors;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwptrackbackphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-trackback.php (24206 => 24207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-trackback.php 2013-05-08 21:26:17 UTC (rev 24206)
+++ trunk/wp-trackback.php 2013-05-08 21:27:31 UTC (rev 24207)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> if ( !pings_open($tb_id) )
</span><span class="cx"> trackback_response(1, 'Sorry, trackbacks are closed for this item.');
</span><span class="cx">
</span><del>- $title = wp_html_excerpt( $title, 250 ).'...';
- $excerpt = wp_html_excerpt( $excerpt, 252 ).'...';
</del><ins>+ $title = wp_html_excerpt( $title, 250 ) . '…';
+ $excerpt = wp_html_excerpt( $excerpt, 252 ) . '…';
</ins><span class="cx">
</span><span class="cx"> $comment_post_ID = (int) $tb_id;
</span><span class="cx"> $comment_author = $blog_name;
</span></span></pre>
</div>
</div>
</body>
</html>