<!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>[50916] trunk: Docs: Miscellaneous DocBlock corrections.</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/50916">50916</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/50916","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>2021-05-15 17:36:49 +0000 (Sat, 15 May 2021)</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: Miscellaneous DocBlock corrections.
See <a href="https://core.trac.wordpress.org/ticket/52628">#52628</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminauthorizeapplicationphp">trunk/src/wp-admin/authorize-application.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsimplepiefilephp">trunk/src/wp-includes/class-wp-simplepie-file.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludeshttpsdetectionphp">trunk/src/wp-includes/https-detection.php</a></li>
<li><a href="#trunksrcwpincludessitemapsphp">trunk/src/wp-includes/sitemaps.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwploadphp">trunk/src/wp-load.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminauthorizeapplicationphp"></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/authorize-application.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/authorize-application.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-admin/authorize-application.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_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">-// This is the no-js fallback script. Generally this will all be handled by `auth-app.js`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// This is the no-js fallback script. Generally this will all be handled by `auth-app.js`.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['action'] ) && 'authorize_application_password' === $_POST['action'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'authorize_application_password' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></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/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,8 +1513,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The test results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_test_https_status() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Enforce fresh HTTPS detection results. This is normally invoked by using cron, but for Site Health it should
- // always rely on the latest results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Enforce fresh HTTPS detection results. This is normally invoked by using cron,
+ // but for Site Health it should always rely on the latest results.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_https_detection_errors();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_update_url = wp_get_default_update_https_url();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1541,8 +1541,8 @@
</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"> if ( ! wp_is_using_https() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the website is not using HTTPS, provide more information about whether it is supported and how it can
- // be enabled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the website is not using HTTPS, provide more information
+ // about whether it is supported and how it can be enabled.
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'Your website does not use HTTPS' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-admin/setup-config.php 2021-05-15 17:36:49 UTC (rev 50916)
</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"> $wp_config_perms = fileperms( $path_to_wp_config );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $wp_config_perms ) && ! is_writable( $path_to_wp_config ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_message = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1 wp-config.php, 2: Documentation URL. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: Documentation URL. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You need to make the file %1$s writable before you can save your changes. See <a href="%2$s">Changing File Permissions</a> for more information.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/changing-file-permissions/' )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiefilephp"></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-simplepie-file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-simplepie-file.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-includes/class-wp-simplepie-file.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0 Updated to use a PHP5 constructor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.6.1 Multiple headers are concatenated into a comma-separated string, rather than remaining
- * an array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.6.1 Multiple headers are concatenated into a comma-separated string,
+ * rather than remaining an array.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url Remote file URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $timeout Optional. How long the connection should stay open in seconds.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,12 +70,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->headers = wp_remote_retrieve_headers( $res );
</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">- * SimplePie expects multiple headers to be stored as a comma-separated string, but
- * `wp_remote_retrieve_headers()` returns them as an array, so they need to be
- * converted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * SimplePie expects multiple headers to be stored as a comma-separated string,
+ * but `wp_remote_retrieve_headers()` returns them as an array, so they need
+ * to be converted.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The only exception to that is the `content-type` header, which should ignore any
- * previous values and only use the last one.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The only exception to that is the `content-type` header, which should ignore
+ * any previous values and only use the last one.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see SimplePie_HTTP_Parser::new_line().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-includes/feed.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,8 +796,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = new SimplePie();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We must manually overwrite $feed->sanitize because SimplePie's
- // constructor sets it before we have a chance to set the sanitization class.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We must manually overwrite $feed->sanitize because SimplePie's constructor
+ // sets it before we have a chance to set the sanitization class.
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed->sanitize = new WP_SimplePie_Sanitize_KSES();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register the cache handler using the recommended method for SimplePie 1.3 or later.
</span></span></pre></div>
<a id="trunksrcwpincludeshttpsdetectionphp"></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/https-detection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/https-detection.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-includes/https-detection.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,8 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks whether the current site's URL where WordPress is stored is using HTTPS.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This checks the URL where WordPress application files (e.g. wp-blog-header.php or the wp-admin/ folder) are
- * accessible.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This checks the URL where WordPress application files (e.g. wp-blog-header.php or the wp-admin/ folder)
+ * are accessible.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @see site_url()
</span></span></pre></div>
<a id="trunksrcwpincludessitemapsphp"></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/sitemaps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sitemaps.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-includes/sitemaps.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_sitemap_providers() {
</span><span class="cx" style="display: block; padding: 0 10px"> $sitemaps = wp_sitemaps_get_server();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $sitemaps->registry->get_providers();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_sitemap_provider( $name, WP_Sitemaps_Provider $provider ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sitemaps = wp_sitemaps_get_server();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $sitemaps->registry->add_provider( $name, $provider );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,12 +96,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name The sitemap name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $subtype_name The sitemap subtype name. Default empty string.
- * @param int $page The page of the sitemap. Default 1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $subtype_name The sitemap subtype name. Default empty string.
+ * @param int $page The page of the sitemap. Default 1.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The sitemap URL or false if the sitemap doesn't exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_sitemap_url( $name, $subtype_name = '', $page = 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sitemaps = wp_sitemaps_get_server();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sitemaps ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,5 +124,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 >= $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $provider->get_sitemap_url( $subtype_name, $page );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-includes/user.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_User_Query
</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 array $args Optional. Arguments to retrieve users. See WP_User_Query::prepare_query().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args Optional. Arguments to retrieve users. See WP_User_Query::prepare_query()
</ins><span class="cx" style="display: block; padding: 0 10px"> * for more information on accepted arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of users.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-load.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/src/wp-load.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,13 +25,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The error_reporting() function can be disabled in php.ini. On systems where that is the case,
</span><span class="cx" style="display: block; padding: 0 10px"> * it's best to add a dummy function to the wp-config.php file, but as this call to the function
</span><span class="cx" style="display: block; padding: 0 10px"> * is run prior to wp-config.php loading, it is wrapped in a function_exists() check.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * Initialize error reporting to a known set of levels.
- *
- * This will be adapted in wp_debug_mode located in wp-includes/load.php based on WP_DEBUG.
- * @see http://php.net/manual/en/errorfunc.constants.php List of known error levels.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'error_reporting' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Initialize error reporting to a known set of levels.
+ *
+ * This will be adapted in wp_debug_mode() located in wp-includes/load.php based on WP_DEBUG.
+ * @see http://php.net/manual/en/errorfunc.constants.php List of known error levels.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
</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="trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/tests/phpunit/tests/general/template.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,6 +568,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"> * @ticket 9862
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 51166
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_selected_and_checked_with_equal_values
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::selected
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,6 +596,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"> * @ticket 9862
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 51166
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_selected_and_checked_with_non_equal_values
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::selected
</span></span></pre></div>
<a id="trunktestsphpunittestspluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable.php 2021-05-14 19:33:05 UTC (rev 50915)
+++ trunk/tests/phpunit/tests/pluggable.php 2021-05-15 17:36:49 UTC (rev 50916)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,13 +328,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28020
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_user_by_should_return_same_instance_as_wp_get_current_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Create a test user
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create a test user.
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
</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 test user as the current user
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the test user as the current user.
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_set_current_user( $new_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the test user using get_user_by()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the test user using get_user_by().
</ins><span class="cx" style="display: block; padding: 0 10px"> $from_get_user_by = get_user_by( 'id', $new_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $current_user, $from_get_user_by );
</span></span></pre>
</div>
</div>
</body>
</html>