<!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>[57584] trunk/src: General: Remove ableist language from code comments.</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/57584">57584</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/57584","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-11 19:12:42 +0000 (Sun, 11 Feb 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'>General: Remove ableist language from code comments.
Remove a handful of occurrences of ableist terms in code comments; omits external libraries.
Props dartiss, upadalavipul, SergeyBiryukov, shailu25, jorbin, dmsnell, joedolson, manfcarlo.
Fixes <a href="https://core.trac.wordpress.org/ticket/60247">#60247</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmincommentjs">trunk/src/js/_enqueues/admin/comment.js</a></li>
<li><a href="#trunksrcjs_enqueuesadminpostjs">trunk/src/js/_enqueues/admin/post.js</a></li>
<li><a href="#trunksrcwpincludesclasssimplepiephp">trunk/src/wp-includes/class-simplepie.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmincommentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/comment.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/comment.js 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/js/_enqueues/admin/comment.js 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {Event} event The event object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timestampdiv.find('.save-timestamp').on( 'click', function( event ) { // Crazyhorse - multiple OK cancels.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $timestampdiv.find('.save-timestamp').on( 'click', function( event ) { // Crazyhorse branch - multiple OK cancels.
</ins><span class="cx" style="display: block; padding: 0 10px"> var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(),
</span><span class="cx" style="display: block; padding: 0 10px"> newD = new Date( aa, mm - 1, jj, hh, mn );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadminpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/post.js 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/js/_enqueues/admin/post.js 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -889,7 +889,7 @@
</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"> // Set the selected visibility as current.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $postVisibilitySelect.find('.save-post-visibility').on( 'click', function( event ) { // Crazyhorse - multiple OK cancels.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $postVisibilitySelect.find('.save-post-visibility').on( 'click', function( event ) { // Crazyhorse branch - multiple OK cancels.
</ins><span class="cx" style="display: block; padding: 0 10px"> var visibilityLabel = '', selectedVisibility = $postVisibilitySelect.find('input:radio:checked').val();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $postVisibilitySelect.slideUp('fast');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,7 +945,7 @@
</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"> // Save the changed timestamp.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timestampdiv.find('.save-timestamp').on( 'click', function( event ) { // Crazyhorse - multiple OK cancels.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $timestampdiv.find('.save-timestamp').on( 'click', function( event ) { // Crazyhorse branch - multiple OK cancels.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( updateText() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $timestampdiv.slideUp('fast');
</span><span class="cx" style="display: block; padding: 0 10px"> $timestampdiv.siblings('a.edit-timestamp').show().trigger( 'focus' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasssimplepiephp"></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/class-simplepie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-simplepie.php 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/wp-includes/class-simplepie.php 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</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"> * RSS 2.0 Namespace
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * (Stupid, I know, but I'm certain it will confuse people less with support.)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * (I know, but I'm certain it will confuse people less with support.)
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> define('SIMPLEPIE_NAMESPACE_RSS_20', '');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1208,7 +1208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Set options to make SP as fast as possible
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Forgoes a substantial amount of data sanitization in favor of speed. This
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * turns SimplePie into a dumb parser of feeds.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * turns SimplePie into an dumb parser of feeds.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $set Whether to set them or not
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></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/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/wp-includes/class-wp-theme.php 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the parent. Pass the current instance so we can do the checks above and assess errors.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
</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="trunksrcwpincludesclasswpxmlrpcserverphp"></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/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6939,7 +6939,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
</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">- // Very stupid, but gives time to the 'from' server to publish!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The remote site may have sent the pingback before it finished publishing its own content
+ * containing this pingback URL. If that happens then it won't be immediately possible to fetch
+ * the pinging post; adding a small delay reduces the likelihood of this happening.
+ *
+ * While there are more robust methods than calling `sleep()` here (because `sleep()` merely
+ * mitigates the risk of requesting the remote post before it's available), this is effective
+ * enough for most cases and avoids introducing more complexity into this code.
+ *
+ * One way to improve the reliability of this code might be to add failure-handling to the remote
+ * fetch and retry up to a set number of times if it receives a 404. This could also handle 401 and
+ * 403 responses to differentiate the "does not exist" failure from the "may not access" failure.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> sleep( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></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/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/wp-includes/shortcodes.php 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $element = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $element );
</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">- // Looks like we found some crazy unfiltered HTML. Skipping it for confidence.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Looks like we found some unexpected unfiltered HTML. Skipping it for confidence.
</ins><span class="cx" style="display: block; padding: 0 10px"> $element = strtr( $element, $trans );
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2024-02-11 17:02:46 UTC (rev 57583)
+++ trunk/src/wp-includes/theme.php 2024-02-11 19:12:42 UTC (rev 57584)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2802,7 +2802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * the constant is always accurate (and is not defined later, overriding our value).
</span><span class="cx" style="display: block; padding: 0 10px"> * As stated above, the first value wins.
</span><span class="cx" style="display: block; padding: 0 10px"> * Once we get to wp_loaded (just-in-time), define any constants we haven't already.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Constants are lame. Don't reference them. This is just for backward compatibility.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Constants should be avoided. Don't reference them. This is just for backward compatibility.
</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"> if ( defined( 'NO_HEADER_TEXT' ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>