<!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>[32161] trunk/src/wp-includes: Clean up wp_staticize_emoji() and friends.</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="https://core.trac.wordpress.org/changeset/32161">32161</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32161","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-20 04:14:32 +0000 (Mon, 20 Apr 2015)</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'>Clean up wp_staticize_emoji() and friends.
* DOMDocument was removed in <a href="https://core.trac.wordpress.org/changeset/31752">[31752]</a> but not the check.
* wp_staticize_emoji() has never accepted a second arg; remove it from calls.
* Remove wp_staticize_emoji_for_feeds(), no need for it.
* Remove _ and @ignore from wp_staticize_emoji_for_email(), no need for it.
see <a href="https://core.trac.wordpress.org/ticket/31242">#31242</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2015-04-20 03:52:03 UTC (rev 32160)
+++ trunk/src/wp-includes/default-filters.php 2015-04-20 04:14:32 UTC (rev 32161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,19 +160,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title_rss', 'esc_html' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content_rss', 'ent2ncr', 8 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'the_content_feed', '_wp_staticize_emoji_for_feeds' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'the_content_feed', 'wp_staticize_emoji' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_rss', 'convert_chars' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_author_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_text_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_text_rss', 'esc_html' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'comment_text_rss', '_wp_staticize_emoji_for_feeds' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'comment_text_rss', 'wp_staticize_emoji' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bloginfo_rss', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_author', 'ent2ncr', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_guid', 'esc_url' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Email filters
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'wp_mail', '_wp_staticize_emoji_for_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Misc filters
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_ping_sites', 'privacy_ping_filter' );
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2015-04-20 03:52:03 UTC (rev 32160)
+++ trunk/src/wp-includes/feed.php 2015-04-20 04:14:32 UTC (rev 32161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,16 +649,3 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $feed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/**
- * Convert emoji characters in a feed into static images.
- *
- * @ignore
- * @since 4.2.0
- *
- * @param string $content The content to convert.
- * @return The converted content.
- */
-function _wp_staticize_emoji_for_feeds( $content ) {
- return wp_staticize_emoji( $content, true );
-}
</del></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-04-20 03:52:03 UTC (rev 32160)
+++ trunk/src/wp-includes/formatting.php 2015-04-20 04:14:32 UTC (rev 32161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4236,10 +4236,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_staticize_emoji( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = wp_encode_emoji( $text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! class_exists( 'DOMDocument' ) ) {
- return $text;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/formatting.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4314,13 +4310,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Convert emoji in emails into static images.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ignore
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $mail The email data array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The email data array, with emoji in the message staticized.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_staticize_emoji_for_email( $mail ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_staticize_emoji_for_email( $mail ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $mail['message'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $mail;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4373,7 +4368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_type = apply_filters( 'wp_mail_content_type', $content_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'text/html' === $content_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mail['message'] = wp_staticize_emoji( $mail['message'], true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mail['message'] = wp_staticize_emoji( $mail['message'] );
</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"> return $mail;
</span></span></pre>
</div>
</div>
</body>
</html>