<!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>[38809] trunk: Charset: Allow `_canonical_charset()` to handle mixed-case strings.</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/38809">38809</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/38809","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-17 23:53:20 +0000 (Mon, 17 Oct 2016)</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'>Charset: Allow `_canonical_charset()` to handle mixed-case strings.
Add improved unit tests, and collect existing unit tests together.
Props pbearne.
Fixes <a href="https://core.trac.wordpress.org/ticket/38337">#38337</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionscanonicalcharsetphp">trunk/tests/phpunit/tests/functions/canonical-charset.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-10-17 20:00:53 UTC (rev 38808)
+++ trunk/src/wp-includes/functions.php 2016-10-17 23:53:20 UTC (rev 38809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //TODO: Tidy this ghetto code up and make the debug code optional
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include_once( ABSPATH . WPINC . '/class-IXR.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include_once( ABSPATH . WPINC . '/class-IXR.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_links = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5250,13 +5250,15 @@
</span><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' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
- 'UTF8' === $charset )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'UTF-8';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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 ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
- 'iso8859-1' === $charset || 'ISO8859-1' === $charset )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'iso-8859-1' === strtolower( $charset ) || 'iso8859-1' === strtolower( $charset ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'ISO-8859-1';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $charset;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionscanonicalcharsetphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/functions/canonical-charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/canonical-charset.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/canonical-charset.php 2016-10-17 23:53:20 UTC (rev 38809)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,88 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/*
+ * Validate that's badly named charsets always return the correct format for UTF-8 and ISO-8859-1
+ *
+ * @since 4.8.0
+ */
+
+class Tests_Functions_canonical_charset extends WP_UnitTestCase {
+
+ public function test_utf_8_lower() {
+ $this->assertEquals( 'UTF-8', _canonical_charset( 'utf-8' ) );
+ }
+
+ public function test_utf_8_upper() {
+ $this->assertEquals( 'UTF-8', _canonical_charset( 'UTF-8' ) );
+ }
+
+ public function test_utf_8_mixxed() {
+ $this->assertEquals( 'UTF-8', _canonical_charset( 'Utf-8' ) );
+ }
+
+ public function test_utf_8() {
+ $this->assertEquals( 'UTF-8', _canonical_charset( 'UTF8' ) );
+ }
+
+ public function test_iso_lower() {
+ $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'iso-8859-1' ) );
+ }
+
+ public function test_iso_upper() {
+ $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'ISO-8859-1' ) );
+ }
+
+ public function test_iso_mixxed() {
+ $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'Iso8859-1' ) );
+ }
+
+ public function test_iso() {
+ $this->assertEquals( 'ISO-8859-1', _canonical_charset( 'ISO8859-1' ) );
+ }
+
+ public function test_random() {
+ $this->assertEquals( 'random', _canonical_charset( 'random' ) );
+ }
+
+ public function test_empty() {
+ $this->assertEquals( '', _canonical_charset( '' ) );
+ }
+
+ /**
+ * @ticket 23688
+ */
+ function test_update_option_blog_charset() {
+ $orig_blog_charset = get_option( 'blog_charset' );
+
+ update_option( 'blog_charset', 'utf8' );
+ $this->assertEquals( 'UTF-8', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'utf-8' );
+ $this->assertEquals( 'UTF-8', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'UTF8' );
+ $this->assertEquals( 'UTF-8', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'UTF-8' );
+ $this->assertEquals( 'UTF-8', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'ISO-8859-1' );
+ $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'ISO8859-1' );
+ $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'iso8859-1' );
+ $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', 'iso-8859-1' );
+ $this->assertEquals( 'ISO-8859-1', get_option( 'blog_charset') );
+
+ // Arbitrary strings are passed through.
+ update_option( 'blog_charset', 'foobarbaz' );
+ $this->assertEquals( 'foobarbaz', get_option( 'blog_charset') );
+
+ update_option( 'blog_charset', $orig_blog_charset );
+ }
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/functions/canonical-charset.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:executable</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+*
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>