<!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>[58169] trunk/src: Move is_utf8_charset() into functions.php</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/58169">58169</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/58169","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-18 18:20:19 +0000 (Sat, 18 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'>Move is_utf8_charset() into functions.php
This caused issues in maintenance mode, and it's not warranted to have
its own module. This will live alongside `_canonical_charset()`, it's
partner function.
Fixes: <a href="https://core.trac.wordpress.org/ticket/61182">#61182</a>.
Props: dmsnell, sergeybiryukov, swisspiddy.
Follow-up to: <a href="https://core.trac.wordpress.org/changeset/58148">[58148]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesunicodephp">trunk/src/wp-includes/unicode.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 2024-05-18 15:19:09 UTC (rev 58168)
+++ trunk/src/wp-includes/functions.php 2024-05-18 18:20:19 UTC (rev 58169)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7466,6 +7466,49 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Indicates if a given slug for a character set represents the UTF-8
+ * text encoding. If not provided, examines the current blog's charset.
+ *
+ * A charset is considered to represent UTF-8 if it is a case-insensitive
+ * match of "UTF-8" with or without the hyphen.
+ *
+ * Example:
+ *
+ * true === is_utf8_charset( 'UTF-8' );
+ * true === is_utf8_charset( 'utf8' );
+ * false === is_utf8_charset( 'latin1' );
+ * false === is_utf8_charset( 'UTF 8' );
+ *
+ * // Only strings match.
+ * false === is_utf8_charset( [ 'charset' => 'utf-8' ] );
+ *
+ * // Without a given charset, it depends on the site option "blog_charset".
+ * $is_utf8 = is_utf8_charset();
+ *
+ * @since 6.6.0
+ *
+ * @param ?string $blog_charset Slug representing a text character encoding, or "charset".
+ * E.g. "UTF-8", "Windows-1252", "ISO-8859-1", "SJIS".
+ * @return bool Whether the slug represents the UTF-8 encoding.
+ */
+function is_utf8_charset( $blog_charset = null ) {
+ $charset_to_examine = $blog_charset ?? get_option( 'blog_charset' );
+
+ /*
+ * Only valid string values count: the absence of a charset
+ * does not imply any charset, let alone UTF-8.
+ */
+ if ( ! is_string( $charset_to_examine ) ) {
+ return false;
+ }
+
+ return (
+ 0 === strcasecmp( 'UTF-8', $charset_to_examine ) ||
+ 0 === strcasecmp( 'UTF8', $charset_to_examine )
+ );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieves a canonical form of the provided charset appropriate for passing to PHP
</span><span class="cx" style="display: block; padding: 0 10px"> * functions such as htmlspecialchars() and charset HTML attributes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesunicodephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/unicode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/unicode.php 2024-05-18 15:19:09 UTC (rev 58168)
+++ trunk/src/wp-includes/unicode.php 2024-05-18 18:20:19 UTC (rev 58169)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,51 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * WordPress API providing Unicode-relevant utilities.
- *
- * @since 6.6.0
- *
- * @package WordPress
- */
-
-/**
- * Indicates if a given slug for a character set represents the UTF-8
- * text encoding. If not provided, examines the current blog's charset.
- *
- * A charset is considered to represent UTF-8 if it is a case-insensitive
- * match of "UTF-8" with or without the hyphen.
- *
- * Example:
- *
- * true === is_utf8_charset( 'UTF-8' );
- * true === is_utf8_charset( 'utf8' );
- * false === is_utf8_charset( 'latin1' );
- * false === is_utf8_charset( 'UTF 8' );
- *
- * // Only strings match.
- * false === is_utf8_charset( [ 'charset' => 'utf-8' ] );
- *
- * // Without a given charset, it depends on the site option "blog_charset".
- * $is_utf8 = is_utf8_charset();
- *
- * @since 6.6.0
- *
- * @param ?string $blog_charset Slug representing a text character encoding, or "charset".
- * E.g. "UTF-8", "Windows-1252", "ISO-8859-1", "SJIS".
- * @return bool Whether the slug represents the UTF-8 encoding.
- */
-function is_utf8_charset( $blog_charset = null ) {
- $charset_to_examine = $blog_charset ?? get_option( 'blog_charset' );
-
- /*
- * Only valid string values count: the absence of a charset
- * does not imply any charset, let alone UTF-8.
- */
- if ( ! is_string( $charset_to_examine ) ) {
- return false;
- }
-
- return (
- 0 === strcasecmp( 'UTF-8', $charset_to_examine ) ||
- 0 === strcasecmp( 'UTF8', $charset_to_examine )
- );
-}
</del></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-18 15:19:09 UTC (rev 58168)
+++ trunk/src/wp-settings.php 2024-05-18 18:20:19 UTC (rev 58169)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require ABSPATH . WPINC . '/unicode.php';
</del><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>
</div>
</body>
</html>