<!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>[45956] branches/4.6: Remove _convert_urlencoded_to_entities() from the get_the_content() callback.</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 { white-space: pre-line; 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/45956">45956</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/45956","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-04 16:37:44 +0000 (Wed, 04 Sep 2019)</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'>Remove _convert_urlencoded_to_entities() from the get_the_content() callback.
Merges <a href="https://core.trac.wordpress.org/changeset/45937">[45937]</a> to the 4.6 branch.
Props vortfu, whyisjake, peterwilsoncc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches46srcwpincludesposttemplatephp">branches/4.6/src/wp-includes/post-template.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches46testsphpunitdataformattingutf8entitizepy">branches/4.6/tests/phpunit/data/formatting/utf-8/entitize.py</a></li>
<li><a href="#branches46testsphpunitdataformattingutf8entitizedtxt">branches/4.6/tests/phpunit/data/formatting/utf-8/entitized.txt</a></li>
<li><a href="#branches46testsphpunitdataformattingutf8uurlencodepy">branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencode.py</a></li>
<li><a href="#branches46testsphpunitdataformattingutf8uurlencodedtxt">branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt</a></li>
<li><a href="#branches46testsphpunittestsformattingUrlEncodedToEntitiesphp">branches/4.6/tests/phpunit/tests/formatting/UrlEncodedToEntities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches46srcwpincludesposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.6/src/wp-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/src/wp-includes/post-template.php 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/src/wp-includes/post-template.php 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,26 +324,10 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
- $output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Preview fix for JavaScript bug with foreign languages.
- *
- * @since 3.1.0
- * @access private
- *
- * @param array $match Match array from preg_replace_callback.
- * @return string
- */
-function _convert_urlencoded_to_entities( $match ) {
- return '&#' . base_convert( $match[1], 16, 10 ) . ';';
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Display the post excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span></span></pre></div>
<a id="branches46testsphpunitdataformattingutf8entitizepy"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.6/tests/phpunit/data/formatting/utf-8/entitize.py</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/phpunit/data/formatting/utf-8/entitize.py 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/tests/phpunit/data/formatting/utf-8/entitize.py 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,24 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Generates entitized.txt from utf-8.txt
-#
-# entitized.txt is used by Tests_Formatting_UrlEncodedToEntities
-
-import codecs
-import sys
-
-def entitize(line):
- """Convert text to &#[dec]; entities."""
- line = line.strip();
- line = ["&#%d;" % ord(s) for s in line]
- return "".join(line)
-
-if __name__ == "__main__":
- args = sys.argv[1:]
- if args and args[0] in ("-h", "--help"):
- print "Usage: python entitize.py < utf-8.txt > entitized.txt"
- sys.exit(2)
-
- sys.stdin = codecs.getreader("utf-8")(sys.stdin)
- sys.stdout = codecs.getwriter("ascii")(sys.stdout)
-
- lines = sys.stdin.readlines()
- sys.stdout.write( "\n".join(map(entitize, lines)) )
</del></span></pre></div>
<a id="branches46testsphpunitdataformattingutf8entitizedtxt"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.6/tests/phpunit/data/formatting/utf-8/entitized.txt</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/phpunit/data/formatting/utf-8/entitized.txt 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/tests/phpunit/data/formatting/utf-8/entitized.txt 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-章子怡
-François Truffaut
-საქართველო
-Björk Guðmundsdóttir
-宮崎　駿
-👍
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="branches46testsphpunitdataformattingutf8uurlencodepy"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencode.py</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencode.py 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencode.py 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,24 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Generates u-urlencoded.txt from utf-8.txt
-#
-# u-urlencoded.txt is used by Tests_Formatting_UrlEncodedToEntities
-
-import codecs
-import sys
-
-def uurlencode(line):
- """Use %u[hexvalue] percent encoding."""
- line = line.strip()
- line = ["%%u%04X" % ord(s) for s in line]
- return "".join(line)
-
-if __name__ == "__main__":
- args = sys.argv[1:]
- if args and args[0] in ("-h", "--help"):
- print "Usage: python u-urlencode.py < utf-8.txt > u-urlencoded.txt"
- sys.exit(2)
-
- sys.stdin = codecs.getreader("utf-8")(sys.stdin)
- sys.stdout = codecs.getwriter("ascii")(sys.stdout)
-
- lines = sys.stdin.readlines()
- sys.stdout.write( "\n".join(map(uurlencode, lines)) )
</del></span></pre></div>
<a id="branches46testsphpunitdataformattingutf8uurlencodedtxt"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-%u7AE0%u5B50%u6021
-%u0046%u0072%u0061%u006E%u00E7%u006F%u0069%u0073%u0020%u0054%u0072%u0075%u0066%u0066%u0061%u0075%u0074
-%u10E1%u10D0%u10E5%u10D0%u10E0%u10D7%u10D5%u10D4%u10DA%u10DD
-%u0042%u006A%u00F6%u0072%u006B%u0020%u0047%u0075%u00F0%u006D%u0075%u006E%u0064%u0073%u0064%u00F3%u0074%u0074%u0069%u0072
-%u5BAE%u5D0E%u3000%u99FF
-%u1F44D
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="branches46testsphpunittestsformattingUrlEncodedToEntitiesphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.6/tests/phpunit/tests/formatting/UrlEncodedToEntities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.6/tests/phpunit/tests/formatting/UrlEncodedToEntities.php 2019-09-04 16:37:15 UTC (rev 45955)
+++ branches/4.6/tests/phpunit/tests/formatting/UrlEncodedToEntities.php 2019-09-04 16:37:44 UTC (rev 45956)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,24 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group formatting
- */
-class Tests_Formatting_UrlEncodedToEntities extends WP_UnitTestCase {
- /**
- * @dataProvider data
- */
- function test_convert_urlencoded_to_entities( $u_urlencoded, $entity ) {
- $this->assertEquals( $entity, preg_replace_callback('/\%u([0-9A-F]{4,5})/', '_convert_urlencoded_to_entities', $u_urlencoded ), $entity );
- }
-
- function data() {
- $input = file( DIR_TESTDATA . '/formatting/utf-8/u-urlencoded.txt' );
- $output = file( DIR_TESTDATA . '/formatting/utf-8/entitized.txt' );
- $data_provided = array();
- foreach ( $input as $key => $value ) {
- $data_provided[] = array( trim( $value ), trim( $output[ $key ] ) );
- }
- return $data_provided;
- }
-}
-
</del></span></pre>
</div>
</div>
</body>
</html>