<!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>[48199] trunk/src: Docs: Replace "html" and "xhtml" instances in DocBlocks and comments with "HTML" and "XHTML".</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/48199">48199</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/48199","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-28 14:00:26 +0000 (Sun, 28 Jun 2020)</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'>Docs: Replace "html" and "xhtml" instances in DocBlocks and comments with "HTML" and "XHTML".
This ensures consistent capitalization where appropriate.
Props navidos, desrosj.
Fixes <a href="https://core.trac.wordpress.org/ticket/50473">#50473</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyinctemplatetagsphp">trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpincludesclasswpajaxresponsephp">trunk/src/wp-includes/class-wp-ajax-response.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.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="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmediaphp"></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/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-admin/includes/media.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds image shortcode with caption to editor
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds image shortcode with caption to editor.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Private preg_replace callback used in image_add_caption()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Private preg_replace callback used in image_add_caption().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds image html to editor
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds image HTML to editor.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Save a file submitted from a POST request and create an attachment post for it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Saves a file submitted from a POST request and create an attachment post for it.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,8 +283,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file_id Index of the `$_FILES` array that the file was sent. Required.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id The post ID of a post to attach the media item to. Required, but can
</span><span class="cx" style="display: block; padding: 0 10px"> * be set to 0, creating a media item that has no relationship to a post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $post_data Overwrite some of the attachment. Optional.
- * @param array $overrides Override the wp_handle_upload() behavior. Optional.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $post_data Optional. Overwrite some of the attachment.
+ * @param array $overrides Optional. Override the wp_handle_upload() behavior.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error ID of the attachment or a WP_Error object on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-admin/includes/template.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,7 +923,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Print out option html elements for role selectors.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print out option HTML elements for role selectors.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1566,7 +1566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * do_settings_fields() in do_settings-sections()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The $callback argument should be the name of a function that echoes out the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * html input tags for this setting field. Use get_option() to retrieve existing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * HTML input tags for this setting field. Use get_option() to retrieve existing
</ins><span class="cx" style="display: block; padding: 0 10px"> * values to show.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1918,7 +1918,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays the post password.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The password is passed through esc_attr() to ensure that it is safe for placing in an html attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The password is passed through esc_attr() to ensure that it is safe for placing in an HTML attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyinctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php 2020-06-28 14:00:26 UTC (rev 48199)
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the arguments for `twentytwenty_site_logo()`.
</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 $html Compiled html based on our arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $html Compiled HTML based on our arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Parsed arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $classname Class name based on current view, home or single.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $contents HTML for site title or logo.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf( $wrapper, esc_html( $description ) );
</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">- * Filters the html for the site description.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the HTML for the site description.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Twenty 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">- * Fires before post meta html display.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before post meta HTML display.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Allow output of additional post meta info to be added by child themes and plugins.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires after post meta html display.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after post meta HTML display.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Allow output of additional post meta info to be added by child themes and plugins.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpajaxresponsephp"></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-ajax-response.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-ajax-response.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/class-wp-ajax-response.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int|false $old_id The previous response ID. Used as the value for the response type
</span><span class="cx" style="display: block; padding: 0 10px"> * `old_id` attribute. False hides the attribute. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $position Value of the response type `position` attribute. Accepts 1 (bottom),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * -1 (top), html ID (after), or -html ID (before). Default 1 (bottom).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * -1 (top), HTML ID (after), or -HTML ID (before). Default 1 (bottom).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string|WP_Error $data The response content/message. Also accepts a WP_Error object if the
</span><span class="cx" style="display: block; padding: 0 10px"> * ID does not exist. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $supplemental An array of extra strings that will be output within a `<supplemental>`
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,7 +1127,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Print the html template used to render the add-menu-item frame.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print the HTML template used to render the add-menu-item frame.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/comment.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2734,7 +2734,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now do a GET since we're going to look in the HTML headers (and we're sure it's not a binary file).
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_safe_remote_get(
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/deprecated.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,18 +379,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 $cat_name Optional. The category name to use. If no match is found uses all.
- * @param string $before Optional. The html to output before the link.
- * @param string $after Optional. The html to output after the link.
- * @param string $between Optional. The html to output between the link/image and its description. Not used if no image or $show_images is true.
- * @param bool $show_images Optional. Whether to show images (if defined).
- * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner.
- * If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a
- * random order.
- * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
- * @param bool $show_rating Optional. Show rating stars/chars.
- * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Optional. Whether to show last updated timestamp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $cat_name Optional. The category name to use. If no match is found, uses all.
+ * Default 'noname'.
+ * @param string $before Optional. The HTML to output before the link. Default empty.
+ * @param string $after Optional. The HTML to output after the link. Default '<br />'.
+ * @param string $between Optional. The HTML to output between the link/image and its description.
+ * Not used if no image or $show_images is true. Default ' '.
+ * @param bool $show_images Optional. Whether to show images (if defined). Default true.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'id'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
+ * Default true.
+ * @param bool $show_rating Optional. Show rating stars/chars. Default false.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default -1.
+ * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> $show_description = true, $show_rating = false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,11 +452,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 $cat_name The category name to use. If no match is found uses all.
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url', 'description', or 'rating'.
- * Or maybe owner. If you start the name with an underscore the order will be reversed. You can also
- * specify 'rand' as the order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $cat_name Optional. The category name to use. If no match is found, uses all.
+ * Default 'noname'.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'name'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default -1.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,12 +505,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 int $category The category to use. If no category supplied uses all
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- * 'description', or 'rating'. Or maybe owner. If you start the name with an
- * underscore the order will be reversed. You can also specify 'rand' as the
- * order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $category Optional. The category to use. If no category supplied, uses all.
+ * Default 0.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'name'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,18 +534,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 $cat_name The category name to use. If no match is found uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and its description. Not used if no image or show_images is true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- * 'description', or 'rating'. Or maybe owner. If you start the name with an
- * underscore the order will be reversed. You can also specify 'rand' as the
- * order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $cat_name Optional. The category name to use. If no match is found, uses all.
+ * Default 'noname'.
+ * @param string $before Optional. The HTML to output before the link. Default empty.
+ * @param string $after Optional. The HTML to output after the link. Default '<br />'.
+ * @param string $between Optional. The HTML to output between the link/image and its description.
+ * Not used if no image or $show_images is true. Default ' '.
+ * @param bool $show_images Optional. Whether to show images (if defined). Default true.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'id'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
+ * Default true.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default -1.
+ * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
</span><span class="cx" style="display: block; padding: 0 10px"> $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,18 +565,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 int $category The category to use. If no category supplied uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and its description. Not used if no image or show_images == true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url',
- * 'description', or 'rating'. Or maybe owner. If you start the name with an
- * underscore the order will be reversed. You can also specify 'rand' as the
- * order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $category Optional. The category to use. If no category supplied, uses all.
+ * Default 0.
+ * @param string $before Optional. The HTML to output before the link. Default empty.
+ * @param string $after Optional. The HTML to output after the link. Default '<br />'.
+ * @param string $between Optional. The HTML to output between the link/image and its description.
+ * Not used if no image or $show_images is true. Default ' '.
+ * @param bool $show_images Optional. Whether to show images (if defined). Default true.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'id'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
+ * Default true.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default -1.
+ * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,21 +922,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0 Use get_bookmarks()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_bookmarks()
</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 int $category The category to use. If no category supplied uses all
- * @param string $before the html to output before the link
- * @param string $after the html to output after the link
- * @param string $between the html to output between the link/image and its description.
- * Not used if no image or show_images == true
- * @param bool $show_images whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- * 'description', or 'rating'. Or maybe owner. If you start the name with an
- * underscore the order will be reversed. You can also specify 'rand' as the order
- * which will return links in a random order.
- * @param bool $show_description whether to show the description if show_images=false/not defined.
- * @param bool $show_rating show rating stars/chars
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated whether to show last updated timestamp
- * @param bool $echo whether to echo the results, or return them instead
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $category Optional. The category to use. If no category supplied uses all.
+ * Default 0.
+ * @param string $before Optional. The HTML to output before the link. Default empty.
+ * @param string $after Optional. The HTML to output after the link. Default '<br />'.
+ * @param string $between Optional. The HTML to output between the link/image and its description.
+ * Not used if no image or $show_images is true. Default ' '.
+ * @param bool $show_images Optional. Whether to show images (if defined). Default true.
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url',
+ * 'description', 'rating', or 'owner'. Default 'name'.
+ * If you start the name with an underscore, the order will be reversed.
+ * Specifying 'rand' as the order will return links in a random order.
+ * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
+ * Default true.
+ * @param bool $show_rating Optional. Show rating stars/chars. Default false.
+ * @param int $limit Optional. Limit to X entries. If not specified, all entries are shown.
+ * Default -1.
+ * @param int $show_updated Optional. Whether to show last updated timestamp. Default 1.
+ * @param bool $echo Whether to echo the results, or return them instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return null|string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1628,19 +1649,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Display the post content for the feed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * For encoding the html or the $encode_html parameter, there are three possible
- * values. '0' will make urls footnotes and use make_url_footnote(). '1' will
- * encode special characters and automatically display all of the content. The
- * value of '2' will strip all HTML tags from the content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For encoding the HTML or the $encode_html parameter, there are three possible values:
+ * - '0' will make urls footnotes and use make_url_footnote().
+ * - '1' will encode special characters and automatically display all of the content.
+ * - '2' will strip all HTML tags from the content.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Also note that you cannot set the amount of words and not set the html
- * encoding. If that is the case, then the html encoding will default to 2,
- * which will strip all HTML tags.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Also note that you cannot set the amount of words and not set the HTML encoding.
+ * If that is the case, then the HTML encoding will default to 2, which will strip
+ * all HTML tags.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * To restrict the amount of words of the content, you can use the cut
- * parameter. If the content is less than the amount, then there won't be any
- * dots added to the end. If there is content left over, then dots will be added
- * and the rest of the content will be removed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * To restrict the amount of words of the content, you can use the cut parameter.
+ * If the content is less than the amount, then there won't be any dots added to the end.
+ * If there is content left over, then dots will be added and the rest of the content
+ * will be removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1647,11 +1668,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.9.0 Use the_content_feed()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see the_content_feed()
</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 $more_link_text Optional. Text to display when more content is available but not displayed.
- * @param int $stripteaser Optional. Default is 0.
- * @param string $more_file Optional.
- * @param int $cut Optional. Amount of words to keep for the content.
- * @param int $encode_html Optional. How to encode the content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $more_link_text Optional. Text to display when more content is available
+ * but not displayed. Default '(more...)'.
+ * @param int $stripteaser Optional. Default 0.
+ * @param string $more_file Optional.
+ * @param int $cut Optional. Amount of words to keep for the content.
+ * @param int $encode_html Optional. How to encode the content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,7 +1726,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.9.0
</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 $content Content to get links
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content Content to get links.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML stripped out of content with links at the bottom.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function make_url_footnote( $content ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1742,9 +1764,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.9.0 Use _x()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _x()
</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 $text Text to translate
- * @param string $domain Optional. Domain to retrieve the translated text
- * @return string Translated context string without pipe
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $text Text to translate.
+ * @param string $domain Optional. Domain to retrieve the translated text.
+ * @return string Translated context string without pipe.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _c( $text, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1759,9 +1781,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.0.0 Use _x()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _x()
</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 $text Text to translate
- * @param string $domain Domain to retrieve the translated text
- * @return string Translated text
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $text Text to translate.
+ * @param string $domain Domain to retrieve the translated text.
+ * @return string Translated text.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function translate_with_context( $text, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></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/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/feed.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,12 +535,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine the type of a string of data with the data formatted.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Tell whether the type is text, html, or xhtml, per RFC 4287 section 3.1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tell whether the type is text, HTML, or XHTML, per RFC 4287 section 3.1.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * In the case of WordPress, text is defined as containing no markup,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * xhtml is defined as "well formed", and html as tag soup (i.e., the rest).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * XHTML is defined as "well formed", and HTML as tag soup (i.e., the rest).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Container div tags are added to xhtml values, per section 3.1.1.3.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Container div tags are added to XHTML values, per section 3.1.1.3.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.3.1
</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 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/formatting.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -928,7 +928,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * double if set to 'double' or both if otherwise set.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default is ENT_NOQUOTES.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param false|string $charset Optional. The character encoding of the string. Default false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $double_encode Optional. Whether to encode existing html entities. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $double_encode Optional. Whether to encode existing HTML entities. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The encoded text with HTML entities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5136,7 +5136,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Safely extracts not more than the first $count characters from html string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Safely extracts not more than the first $count characters from HTML string.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * UTF-8, tags and entities safe prefix extraction. Entities inside will *NOT*
</span><span class="cx" style="display: block; padding: 0 10px"> * be counted as one character. For example & will be counted as 4, < as
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6013,7 +6013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Saving hex colors without a hash puts the burden of adding the hash on the
</span><span class="cx" style="display: block; padding: 0 10px"> * UI, which makes it difficult to use or upgrade to other color types such as
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * rgba, hsl, rgb, and html color names.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * rgba, hsl, rgb, and HTML color names.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns either '', a 3 or 6 digit hex color (without a #), or null.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/functions.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6559,7 +6559,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"> * Retrieve a canonical form of the provided charset appropriate for passing to PHP
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * functions such as htmlspecialchars() and charset html attributes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * functions such as htmlspecialchars() and charset HTML attributes.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/general-template.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3915,7 +3915,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the contents of the search WordPress query variable.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The search query string is passed through esc_attr() to ensure that it is safe
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * for placing in an html attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * for placing in an HTML attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3943,7 +3943,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays the contents of the search query variable.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The search query string is passed through esc_attr() to ensure that it is safe
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * for placing in an html attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * for placing in an HTML attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3959,14 +3959,14 @@
</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">- * Gets the language attributes for the html tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the language attributes for the 'html' tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Builds up a set of html attributes containing the text direction and language
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Builds up a set of HTML attributes containing the text direction and language
</ins><span class="cx" style="display: block; padding: 0 10px"> * information for the page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</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 $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $doctype Optional. The type of HTML document. Accepts 'xhtml' or 'html'. Default 'html'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_language_attributes( $doctype = 'html' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3989,27 +3989,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output = implode( ' ', $attributes );
</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">- * Filters the language attributes for display in the html tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the language attributes for display in the 'html' tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 Added the `$doctype` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output A space-separated list of language attributes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $doctype The type of html document (xhtml|html).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $doctype The type of HTML document (xhtml|html).
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'language_attributes', $output, $doctype );
</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">- * Displays the language attributes for the html tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Displays the language attributes for the 'html' tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Builds up a set of html attributes containing the text direction and language
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Builds up a set of HTML attributes containing the text direction and language
</ins><span class="cx" style="display: block; padding: 0 10px"> * information for the page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 Converted into a wrapper for get_language_attributes().
</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 $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $doctype Optional. The type of HTML document. Accepts 'xhtml' or 'html'. Default 'html'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function language_attributes( $doctype = 'html' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_language_attributes( $doctype );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4654,7 +4654,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs the html checked attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Outputs the HTML checked attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Compares the first two arguments and if identical marks as checked
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4663,7 +4663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $checked One of the values to compare
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether to echo or just return the string
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string html attribute or empty string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML attribute or empty string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function checked( $checked, $current = true, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return __checked_selected_helper( $checked, $current, $echo, 'checked' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4670,7 +4670,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs the html selected attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Outputs the HTML selected attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Compares the first two arguments and if identical marks as selected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4679,7 +4679,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $selected One of the values to compare
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether to echo or just return the string
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string html attribute or empty string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML attribute or empty string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function selected( $selected, $current = true, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return __checked_selected_helper( $selected, $current, $echo, 'selected' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4686,7 +4686,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs the html disabled attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Outputs the HTML disabled attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Compares the first two arguments and if identical marks as disabled
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4695,7 +4695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $disabled One of the values to compare
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether to echo or just return the string
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string html attribute or empty string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML attribute or empty string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function disabled( $disabled, $current = true, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4702,7 +4702,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs the html readonly attribute.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Outputs the HTML readonly attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Compares the first two arguments and if identical marks as readonly
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4711,7 +4711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $readonly One of the values to compare
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether to echo or just return the string
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string html attribute or empty string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML attribute or empty string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function readonly( $readonly, $current = true, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return __checked_selected_helper( $readonly, $current, $echo, 'readonly' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4729,7 +4729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo Whether to echo or just return the string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $type The type of checked|selected|disabled|readonly we are doing
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string html attribute or empty string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML attribute or empty string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function __checked_selected_helper( $helper, $current, $echo, $type ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (string) $helper === (string) $current ) {
</span></span></pre></div>
<a id="trunksrcwpincludesksesphp"></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/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2020-06-28 11:51:29 UTC (rev 48198)
+++ trunk/src/wp-includes/kses.php 2020-06-28 14:00:26 UTC (rev 48199)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2390,7 +2390,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Helper function to add global attributes to a tag in the allowed html list.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Helper function to add global attributes to a tag in the allowed HTML list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0 Add support for `data-*` wildcard attributes.
</span></span></pre>
</div>
</div>
</body>
</html>