<!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>[58147] trunk: Normalize UTF-8 charset slug detection.</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/58147">58147</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/58147","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dmsnell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-14 18:03:43 +0000 (Tue, 14 May 2024)</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'>Normalize UTF-8 charset slug detection.
There are several exist places in Core that attempt to detect if a blog charset
is UTF-8. Each place attempts to perform the same check, except the logic is
spread throughout and there's no single method provided to make this
determination in a consistent way. The `_canonical_charset()` method exists,
but is marked private for use.
In this patch the new `unicode` module provides `is_utf8_charset()` as a method
taking an optional charset slug and indicating if it represents UTF-8,
examining all of the allowable variants of that slug. Associated code is
updated to use this new function, including `_canonical_charset()`. If no slug
is provided, it will look up the current `get_option( 'blog_charset' )`.
Finally, the test functions governing `_canonical_charset()` have been
rewritten as a single test with a data provider instead of as separate test
functions.
Developed in https://github.com/WordPress/wordpress-develop/pull/6535
Discussed in https://core.trac.wordpress.org/ticket/61182
Fixes <a href="https://core.trac.wordpress.org/ticket/61182">#61182</a>.
Props dmsnell, jonsurrell.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionscanonicalCharsetphp">trunk/tests/phpunit/tests/functions/canonicalCharset.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminoptionsreadingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-admin/options-reading.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> settings_fields( 'reading' );
</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 ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_utf8_charset() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-admin/options.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
</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 ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_utf8_charset() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_options['reading'][] = 'blog_charset';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></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/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-includes/compat.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The solution below works only for UTF-8, so in case of a different
</span><span class="cx" style="display: block; padding: 0 10px"> * charset just use built-in substr().
</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 ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_utf8_charset( $encoding ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The solution below works only for UTF-8, so in case of a different charset
</span><span class="cx" style="display: block; padding: 0 10px"> * just use built-in strlen().
</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 ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_utf8_charset( $encoding ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return strlen( $str );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></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 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-includes/formatting.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,20 +960,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $quote_style = ENT_QUOTES;
</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">- // Store the site charset as a static to avoid multiple calls to wp_load_alloptions().
- if ( ! $charset ) {
- static $_charset = null;
- if ( ! isset( $_charset ) ) {
- $alloptions = wp_load_alloptions();
- $_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
- }
- $charset = $_charset;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $charset = _canonical_charset( $charset ? $charset : get_option( 'blog_charset' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ), true ) ) {
- $charset = 'UTF-8';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_quote_style = $quote_style;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'double' === $quote_style ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,7 +1102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Store the site charset as a static to avoid multiple calls to get_option().
</span><span class="cx" style="display: block; padding: 0 10px"> static $is_utf8 = null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $is_utf8 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_utf8 = is_utf8_charset();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_utf8 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $text;
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-includes/functions.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7474,17 +7474,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://core.trac.wordpress.org/ticket/23688
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $charset A charset name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $charset A charset name, e.g. "UTF-8", "Windows-1252", "SJIS".
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The canonical form of the charset.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _canonical_charset( $charset ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_utf8_charset( $charset ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'UTF-8';
</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 ( 'iso-8859-1' === strtolower( $charset ) || 'iso8859-1' === strtolower( $charset ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Normalize the ISO-8859-1 family of languages.
+ *
+ * This is not required for htmlspecialchars(), as it properly recognizes all of
+ * the input character sets that here are transformed into "ISO-8859-1".
+ *
+ * @todo Should this entire check be removed since it's not required for the stated purpose?
+ * @todo Should WordPress transform other potential charset equivalents, such as "latin1"?
+ */
+ if (
+ ( 0 === strcasecmp( 'iso-8859-1', $charset ) ) ||
+ ( 0 === strcasecmp( 'iso8859-1', $charset ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'ISO-8859-1';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/src/wp-settings.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_lang_dir();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load early WordPress files.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require ABSPATH . WPINC . '/unicode.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-wp-list-util.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/formatting.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/meta.php';
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionscanonicalCharsetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions/canonicalCharset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/canonicalCharset.php 2024-05-14 16:47:03 UTC (rev 58146)
+++ trunk/tests/phpunit/tests/functions/canonicalCharset.php 2024-05-14 18:03:43 UTC (rev 58147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,47 +10,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_canonical_charset
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_CanonicalCharset extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- public function test_utf_8_lower() {
- $this->assertSame( 'UTF-8', _canonical_charset( 'utf-8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Ensures that charset variants for common encodings normalize to the expected form.
+ *
+ * @ticket 61182
+ *
+ * @dataProvider data_charset_normalizations
+ *
+ * @param string $given_charset Potential charset provided by user.
+ * @param string $normalized_charset Expected normalized form of charset.
+ */
+ public function test_properly_normalizes_charset_variants( $given_charset, $normalized_charset ) {
+ $this->assertSame(
+ $normalized_charset,
+ _canonical_charset( $given_charset ),
+ 'Did not properly transform the provided charset into its normalized form.'
+ );
</ins><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">- public function test_utf_8_upper() {
- $this->assertSame( 'UTF-8', _canonical_charset( 'UTF-8' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Data provider.
+ *
+ * @return array[].
+ */
+ public static function data_charset_normalizations() {
+ return array(
+ // UTF-8 family.
+ array( 'UTF-8', 'UTF-8' ),
+ array( 'Utf-8', 'UTF-8' ),
+ array( 'Utf-8', 'UTF-8' ),
+ array( 'UTF8', 'UTF-8' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_utf_8_mixxed() {
- $this->assertSame( 'UTF-8', _canonical_charset( 'Utf-8' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Almost UTF-8.
+ array( 'UTF-8*', 'UTF-8*' ),
+ array( 'UTF.8', 'UTF.8' ),
+ array( 'UTF88', 'UTF88' ),
+ array( 'UTF-7', 'UTF-7' ),
+ array( 'X-UTF-8', 'X-UTF-8' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_utf_8() {
- $this->assertSame( 'UTF-8', _canonical_charset( 'UTF8' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ISO-8859-1 family.
+ array( 'iso-8859-1', 'ISO-8859-1' ),
+ array( 'ISO-8859-1', 'ISO-8859-1' ),
+ array( 'Iso-8859-1', 'ISO-8859-1' ),
+ array( 'ISO8859-1', 'ISO-8859-1' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_iso_lower() {
- $this->assertSame( 'ISO-8859-1', _canonical_charset( 'iso-8859-1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Other charset slugs should not be adjusted.
+ array( 'random', 'random' ),
+ array( '', '' ),
+ );
</ins><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">- public function test_iso_upper() {
- $this->assertSame( 'ISO-8859-1', _canonical_charset( 'ISO-8859-1' ) );
- }
-
- public function test_iso_mixxed() {
- $this->assertSame( 'ISO-8859-1', _canonical_charset( 'Iso8859-1' ) );
- }
-
- public function test_iso() {
- $this->assertSame( 'ISO-8859-1', _canonical_charset( 'ISO8859-1' ) );
- }
-
- public function test_random() {
- $this->assertSame( 'random', _canonical_charset( 'random' ) );
- }
-
- public function test_empty() {
- $this->assertSame( '', _canonical_charset( '' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23688
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>