<!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>[54929] trunk/src/wp-includes: Code Modernization: Rename parameters that use reserved keywords in `wp-includes/functions.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54929">54929</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/54929","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>2022-12-03 15:05:41 +0000 (Sat, 03 Dec 2022)</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'>Code Modernization: Rename parameters that use reserved keywords in `wp-includes/functions.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit:
* Renames the `$echo` parameter to `$display` in:
* `wp_nonce_field()`
* `wp_referer_field()`
* `wp_original_referer_field()`
* Renames the `$string` parameter to `$input_string` in
* `_wp_json_convert_string()`
* `_wp_to_kebab_case()`
* Renames the `$list` parameter to `$input_list` in:
* `wp_parse_list()`
* `wp_parse_id_list()`
* `wp_parse_slug_list()`
* `wp_filter_object_list()`
* `wp_list_filter()`
* `wp_list_pluck()`
* `wp_list_sort()`
* Renames the `$array` parameter to `$input_array` in:
* `add_magic_quotes()`
* `wp_array_slice_assoc()`
* `_wp_array_get()`
* `_wp_array_set()`
* Renames the `$function` parameter to `$function_name` in:
* `_deprecated_function()`
* `_deprecated_argument()`
* `_doing_it_wrong()`
* Renames the `$class` parameter to `$class_name` in `_deprecated_constructor()`.
* Renames the `$default` parameter to `$default_value` in `apache_mod_loaded()`.
* Renames the `$var` parameter to `$value` in `wp_validate_boolean()`.
* Amends the `$input` parameter in `wp_parse_str()` for consistency.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52946">[52946]</a>, <a href="https://core.trac.wordpress.org/changeset/52996">[52996]</a>, <a href="https://core.trac.wordpress.org/changeset/52997">[52997]</a>, <a href="https://core.trac.wordpress.org/changeset/52998">[52998]</a>, <a href="https://core.trac.wordpress.org/changeset/53003">[53003]</a>, <a href="https://core.trac.wordpress.org/changeset/53014">[53014]</a>, <a href="https://core.trac.wordpress.org/changeset/53029">[53029]</a>, <a href="https://core.trac.wordpress.org/changeset/53039">[53039]</a>, <a href="https://core.trac.wordpress.org/changeset/53116">[53116]</a>, <a href="https://core.trac.wordpress.org/changeset/53117">[53117]</a>, <a href="https://core.trac.wordpress.org/changeset/53137">[53137]</a>, <a href="https://core.trac.wordpress.org/changeset/53174">[53174]</a>, <a href="https://core.trac.wordpress.org/changeset/53184">[53184]</a>, <a href="https://core.trac.wordpress.org/changeset/53185">[531
85]</a>, <a href="https://core.trac.wordpress.org/changeset/53192">[53192]</a>, <a href="https://core.trac.wordpress.org/changeset/53193">[53193]</a>, <a href="https://core.trac.wordpress.org/changeset/53198">[53198]</a>, <a href="https://core.trac.wordpress.org/changeset/53203">[53203]</a>, <a href="https://core.trac.wordpress.org/changeset/53207">[53207]</a>, <a href="https://core.trac.wordpress.org/changeset/53215">[53215]</a>, <a href="https://core.trac.wordpress.org/changeset/53216">[53216]</a>, <a href="https://core.trac.wordpress.org/changeset/53220">[53220]</a>, <a href="https://core.trac.wordpress.org/changeset/53230">[53230]</a>, <a href="https://core.trac.wordpress.org/changeset/53232">[53232]</a>, <a href="https://core.trac.wordpress.org/changeset/53236">[53236]</a>, <a href="https://core.trac.wordpress.org/changeset/53239">[53239]</a>, <a href="https://core.trac.wordpress.org/changeset/53240">[53240]</a>, <a href="https://core.trac.wordpress.org/changeset/53242">[53242]
</a>, <a href="https://core.trac.wordpress.org/changeset/53243">[53243]</a>, <a href="https://core.trac.wordpress.org/changeset/53245">[53245]</a>, <a href="https://core.trac.wordpress.org/changeset/53246">[53246]</a>, <a href="https://core.trac.wordpress.org/changeset/53257">[53257]</a>, <a href="https://core.trac.wordpress.org/changeset/53269">[53269]</a>, <a href="https://core.trac.wordpress.org/changeset/53270">[53270]</a>, <a href="https://core.trac.wordpress.org/changeset/53271">[53271]</a>, <a href="https://core.trac.wordpress.org/changeset/53272">[53272]</a>, <a href="https://core.trac.wordpress.org/changeset/53273">[53273]</a>, <a href="https://core.trac.wordpress.org/changeset/53274">[53274]</a>, <a href="https://core.trac.wordpress.org/changeset/53275">[53275]</a>, <a href="https://core.trac.wordpress.org/changeset/53276">[53276]</a>, <a href="https://core.trac.wordpress.org/changeset/53277">[53277]</a>, <a href="https://core.trac.wordpress.org/changeset/53281">[53281]</a
>, <a href="https://core.trac.wordpress.org/changeset/53283">[53283]</a>, <a href="https://core.trac.wordpress.org/changeset/53284">[53284]</a>, <a href="https://core.trac.wordpress.org/changeset/53285">[53285]</a>, <a href="https://core.trac.wordpress.org/changeset/53287">[53287]</a>, <a href="https://core.trac.wordpress.org/changeset/53364">[53364]</a>, <a href="https://core.trac.wordpress.org/changeset/53365">[53365]</a>, <a href="https://core.trac.wordpress.org/changeset/54927">[54927]</a>.
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/56788">#56788</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2022-12-02 20:19:53 UTC (rev 54928)
+++ trunk/src/wp-includes/formatting.php 2022-12-03 15:05:41 UTC (rev 54929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5033,11 +5033,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.1
</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 $input The string to be parsed.
- * @param array $result Variables will be stored in this array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $input_string The string to be parsed.
+ * @param array $result Variables will be stored in this array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_parse_str( $input, &$result ) {
- parse_str( (string) $input, $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_parse_str( $input_string, &$result ) {
+ parse_str( (string) $input_string, $result );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the array of variables derived from a parsed string.
</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 2022-12-02 20:19:53 UTC (rev 54928)
+++ trunk/src/wp-includes/functions.php 2022-12-03 15:05:41 UTC (rev 54929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1267,21 +1267,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0 Non-string values are left untouched.
</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 $array Array to walk while sanitizing contents.
- * @return array Sanitized $array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_array Array to walk while sanitizing contents.
+ * @return array Sanitized $input_array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function add_magic_quotes( $array ) {
- foreach ( (array) $array as $k => $v ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_magic_quotes( $input_array ) {
+ foreach ( (array) $input_array as $k => $v ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $v ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $array[ $k ] = add_magic_quotes( $v );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array[ $k ] = add_magic_quotes( $v );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_string( $v ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $array[ $k ] = addslashes( $v );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array[ $k ] = addslashes( $v );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- return $array;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $input_array;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1867,10 +1867,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $action Optional. Action name. Default -1.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Optional. Nonce name. Default '_wpnonce'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $referer Optional. Whether to set the referer field for validation. Default true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $echo Optional. Whether to display or return hidden form field. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $display Optional. Whether to display or return hidden form field. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Nonce field HTML markup.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $display = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = esc_attr( $name );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1878,7 +1878,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_field .= wp_referer_field( 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">- if ( $echo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $display ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $nonce_field;
</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">@@ -1893,14 +1893,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.4
</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 bool $echo Optional. Whether to echo or return the referer field. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $display Optional. Whether to echo or return the referer field. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Referer field HTML markup.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_referer_field( $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_referer_field( $display = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request_url = remove_query_arg( '_wp_http_referer' );
</span><span class="cx" style="display: block; padding: 0 10px"> $referer_field = '<input type="hidden" name="_wp_http_referer" value="' . esc_url( $request_url ) . '" />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $echo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $display ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $referer_field;
</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">@@ -1916,12 +1916,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.4
</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 bool $echo Optional. Whether to echo the original http referer. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $display Optional. Whether to echo the original http referer. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $jump_back_to Optional. Can be 'previous' or page you want to jump back to.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'current'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Original referer field.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_original_referer_field( $display = true, $jump_back_to = 'current' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_get_original_referer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ref ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1930,7 +1930,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $echo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $display ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $orig_referer_field;
</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">@@ -4336,10 +4336,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see _wp_json_sanity_check()
</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 $string The string which is to be converted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $input_string The string which is to be converted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The checked string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_json_convert_string( $string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_json_convert_string( $input_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> static $use_mb = null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $use_mb ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $use_mb = function_exists( 'mb_convert_encoding' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4346,14 +4346,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"> if ( $use_mb ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $encoding = mb_detect_encoding( $string, mb_detect_order(), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $encoding = mb_detect_encoding( $input_string, mb_detect_order(), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $encoding ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return mb_convert_encoding( $string, 'UTF-8', $encoding );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return mb_convert_encoding( $input_string, 'UTF-8', $encoding );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return mb_convert_encoding( $input_string, 'UTF-8', 'UTF-8' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return wp_check_invalid_utf8( $string, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_check_invalid_utf8( $input_string, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4811,18 +4811,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.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 array|string $list List of values.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string $input_list List of values.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of values.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_parse_list( $list ) {
- if ( ! is_array( $list ) ) {
- return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_parse_list( $input_list ) {
+ if ( ! is_array( $input_list ) ) {
+ return preg_split( '/[\s,]+/', $input_list, -1, PREG_SPLIT_NO_EMPTY );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate all entries of the list are scalar.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $list = array_filter( $list, 'is_scalar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_list = array_filter( $input_list, 'is_scalar' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $list;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $input_list;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4831,13 +4831,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0 Refactored to use wp_parse_list().
</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|string $list List of IDs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string $input_list List of IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int[] Sanitized array of IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_parse_id_list( $list ) {
- $list = wp_parse_list( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_parse_id_list( $input_list ) {
+ $input_list = wp_parse_list( $input_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array_unique( array_map( 'absint', $list ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_unique( array_map( 'absint', $input_list ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4846,13 +4846,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0 Refactored to use wp_parse_list().
</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|string $list List of slugs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string $input_list List of slugs.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string[] Sanitized array of slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_parse_slug_list( $list ) {
- $list = wp_parse_list( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_parse_slug_list( $input_list ) {
+ $input_list = wp_parse_list( $input_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array_unique( array_map( 'sanitize_title', $list ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_unique( array_map( 'sanitize_title', $input_list ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4860,16 +4860,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.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 array $array The original array.
- * @param array $keys The list of keys.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_array The original array.
+ * @param array $keys The list of keys.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The array slice.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_array_slice_assoc( $array, $keys ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_array_slice_assoc( $input_array, $keys ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $slice = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keys as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $array[ $key ] ) ) {
- $slice[ $key ] = $array[ $key ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $input_array[ $key ] ) ) {
+ $slice[ $key ] = $input_array[ $key ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4884,7 +4884,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example usage:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $array = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $input_array = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'a' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> * 'b' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> * 'c' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4891,7 +4891,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">- * _wp_array_get( $array, array( 'a', 'b', 'c' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * _wp_array_get( $input_array, array( 'a', 'b', 'c' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @internal
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4898,30 +4898,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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 $array An array from which we want to retrieve some information.
- * @param array $path An array of keys describing the path with which to retrieve information.
- * @param mixed $default Optional. The return value if the path does not exist within the array,
- * or if `$array` or `$path` are not arrays. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_array An array from which we want to retrieve some information.
+ * @param array $path An array of keys describing the path with which to retrieve information.
+ * @param mixed $default_value Optional. The return value if the path does not exist within the array,
+ * or if `$input_array` or `$path` are not arrays. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The value from the path specified.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_array_get( $array, $path, $default = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_array_get( $input_array, $path, $default_value = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Confirm $path is valid.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $path ) || 0 === count( $path ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $default;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $default_value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $path as $path_element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! is_array( $array ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! is_array( $input_array ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> ( ! is_string( $path_element ) && ! is_integer( $path_element ) && ! is_null( $path_element ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! array_key_exists( $path_element, $array )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! array_key_exists( $path_element, $input_array )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $default;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $default_value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $array = $array[ $path_element ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array = $input_array[ $path_element ];
</ins><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">- return $array;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $input_array;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4932,10 +4932,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example usage:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $array = array();
- * _wp_array_set( $array, array( 'a', 'b', 'c', 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $input_array = array();
+ * _wp_array_set( $input_array, array( 'a', 'b', 'c', 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $array becomes:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $input_array becomes:
</ins><span class="cx" style="display: block; padding: 0 10px"> * array(
</span><span class="cx" style="display: block; padding: 0 10px"> * 'a' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> * 'b' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4949,13 +4949,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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 $array An array that we want to mutate to include a specific value in a path.
- * @param array $path An array of keys describing the path that we want to mutate.
- * @param mixed $value The value that will be set.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_array An array that we want to mutate to include a specific value in a path.
+ * @param array $path An array of keys describing the path that we want to mutate.
+ * @param mixed $value The value that will be set.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_array_set( &$array, $path, $value = null ) {
- // Confirm $array is valid.
- if ( ! is_array( $array ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_array_set( &$input_array, $path, $value = null ) {
+ // Confirm $input_array is valid.
+ if ( ! is_array( $input_array ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -4982,15 +4982,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $path_length - 1; ++$i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path_element = $path[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! array_key_exists( $path_element, $array ) ||
- ! is_array( $array[ $path_element ] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! array_key_exists( $path_element, $input_array ) ||
+ ! is_array( $input_array[ $path_element ] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $array[ $path_element ] = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array[ $path_element ] = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $array = &$array[ $path_element ]; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array = &$input_array[ $path_element ]; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
</ins><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">- $array[ $path[ $i ] ] = $value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input_array[ $path[ $i ] ] = $value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5014,11 +5014,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://github.com/lodash-php/lodash-php/blob/master/src/String/kebabCase.php
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://github.com/lodash-php/lodash-php/blob/master/src/internal/unicodeWords.php
</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 $string The string to kebab-case.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $input_string The string to kebab-case.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string kebab-cased-string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_to_kebab_case( $string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_to_kebab_case( $input_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> //phpcs:disable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
</span><span class="cx" style="display: block; padding: 0 10px"> // ignore the camelCase names for variables so the names are the same as lodash
</span><span class="cx" style="display: block; padding: 0 10px"> // so comparing and porting new changes is easier.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5065,7 +5065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '/u';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all( $regexp, str_replace( "'", '', $string ), $matches );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match_all( $regexp, str_replace( "'", '', $input_string ), $matches );
</ins><span class="cx" style="display: block; padding: 0 10px"> return strtolower( implode( '-', $matches[0] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> //phpcs:enable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5106,23 +5106,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Uses `WP_List_Util` class.
</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 $list An array of objects to filter.
- * @param array $args Optional. An array of key => value arguments to match
- * against each object. Default empty array.
- * @param string $operator Optional. The logical operation to perform. 'AND' means
- * all elements from the array must match. 'OR' means only
- * one element needs to match. 'NOT' means no elements may
- * match. Default 'AND'.
- * @param bool|string $field Optional. A field from the object to place instead
- * of the entire object. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_list An array of objects to filter.
+ * @param array $args Optional. An array of key => value arguments to match
+ * against each object. Default empty array.
+ * @param string $operator Optional. The logical operation to perform. 'AND' means
+ * all elements from the array must match. 'OR' means only
+ * one element needs to match. 'NOT' means no elements may
+ * match. Default 'AND'.
+ * @param bool|string $field Optional. A field from the object to place instead
+ * of the entire object. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array A list of objects or object fields.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
- if ( ! is_array( $list ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_filter_object_list( $input_list, $args = array(), $operator = 'and', $field = false ) {
+ if ( ! is_array( $input_list ) ) {
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $util = new WP_List_Util( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $util = new WP_List_Util( $input_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $util->filter( $args, $operator );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5150,17 +5150,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Uses `WP_List_Util` class.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0 Converted into a wrapper for `wp_filter_object_list()`.
</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 $list An array of objects to filter.
- * @param array $args Optional. An array of key => value arguments to match
- * against each object. Default empty array.
- * @param string $operator Optional. The logical operation to perform. 'AND' means
- * all elements from the array must match. 'OR' means only
- * one element needs to match. 'NOT' means no elements may
- * match. Default 'AND'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_list An array of objects to filter.
+ * @param array $args Optional. An array of key => value arguments to match
+ * against each object. Default empty array.
+ * @param string $operator Optional. The logical operation to perform. 'AND' means
+ * all elements from the array must match. 'OR' means only
+ * one element needs to match. 'NOT' means no elements may
+ * match. Default 'AND'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of found values.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
- return wp_filter_object_list( $list, $args, $operator );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_list_filter( $input_list, $args = array(), $operator = 'AND' ) {
+ return wp_filter_object_list( $input_list, $args, $operator );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5173,20 +5173,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0 $index_key parameter added.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Uses `WP_List_Util` class.
</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 $list List of objects or arrays.
- * @param int|string $field Field from the object to place instead of the entire object.
- * @param int|string $index_key Optional. Field from the object to use as keys for the new array.
- * Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_list List of objects or arrays.
+ * @param int|string $field Field from the object to place instead of the entire object.
+ * @param int|string $index_key Optional. Field from the object to use as keys for the new array.
+ * Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of found values. If `$index_key` is set, an array of found values with keys
</span><span class="cx" style="display: block; padding: 0 10px"> * corresponding to `$index_key`. If `$index_key` is null, array keys from the original
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * `$list` will be preserved in the results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * `$input_list` will be preserved in the results.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_list_pluck( $list, $field, $index_key = null ) {
- if ( ! is_array( $list ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_list_pluck( $input_list, $field, $index_key = null ) {
+ if ( ! is_array( $input_list ) ) {
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $util = new WP_List_Util( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $util = new WP_List_Util( $input_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $util->pluck( $field, $index_key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5196,7 +5196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.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 array $list An array of objects or arrays to sort.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $input_list An array of objects or arrays to sort.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $orderby Optional. Either the field name to order by or an array
</span><span class="cx" style="display: block; padding: 0 10px"> * of multiple orderby fields as `$orderby => $order`.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty array.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5205,12 +5205,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $preserve_keys Optional. Whether to preserve keys. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The sorted array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_list_sort( $list, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
- if ( ! is_array( $list ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_list_sort( $input_list, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
+ if ( ! is_array( $input_list ) ) {
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $util = new WP_List_Util( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $util = new WP_List_Util( $input_list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $util->sort( $orderby, $order, $preserve_keys );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5348,11 +5348,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</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 $function The function that was called.
- * @param string $version The version of WordPress that deprecated the function.
- * @param string $replacement Optional. The function that should have been called. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $version The version of WordPress that deprecated the function.
+ * @param string $replacement Optional. The function that should have been called. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_function( $function, $version, $replacement = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_function( $function_name, $version, $replacement = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated function is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5359,11 +5359,11 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $function The function that was called.
- * @param string $replacement The function that should have been called.
- * @param string $version The version of WordPress that deprecated the function.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $replacement The function that should have been called.
+ * @param string $version The version of WordPress that deprecated the function.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'deprecated_function_run', $function, $replacement, $version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'deprecated_function_run', $function_name, $replacement, $version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to trigger an error for deprecated functions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5379,7 +5379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Function %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> $replacement
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5390,7 +5390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Function %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> E_USER_DEPRECATED
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5401,7 +5401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Function %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> $replacement
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5411,7 +5411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Function %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> E_USER_DEPRECATED
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5436,12 +5436,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</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 $class The class containing the deprecated constructor.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $class_name The class containing the deprecated constructor.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the function.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $parent_class Optional. The parent class calling the deprecated constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_constructor( $class, $version, $parent_class = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_constructor( $class_name, $version, $parent_class = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated constructor is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5449,11 +5449,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Added the `$parent_class` parameter.
</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 $class The class containing the deprecated constructor.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $class_name The class containing the deprecated constructor.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the function.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $parent_class The parent class calling the deprecated constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'deprecated_constructor_run', $class, $version, $parent_class );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'deprecated_constructor_run', $class_name, $version, $parent_class );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to trigger an error for deprecated functions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5471,7 +5471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s class in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>__construct()</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5483,7 +5483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s class is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>__construct()</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5495,7 +5495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The called constructor method for %1$s class in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>__construct()</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5506,7 +5506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The called constructor method for %1$s class is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>__construct()</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5632,11 +5632,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</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 $function The function that was called.
- * @param string $version The version of WordPress that deprecated the argument used.
- * @param string $message Optional. A message regarding the change. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $version The version of WordPress that deprecated the argument used.
+ * @param string $message Optional. A message regarding the change. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_argument( $function, $version, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_argument( $function_name, $version, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated argument is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5643,11 +5643,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.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 $function The function that was called.
- * @param string $message A message regarding the change.
- * @param string $version The version of WordPress that deprecated the argument used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $message A message regarding the change.
+ * @param string $version The version of WordPress that deprecated the argument used.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'deprecated_argument_run', $function, $message, $version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'deprecated_argument_run', $function_name, $message, $version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to trigger an error for deprecated arguments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5663,7 +5663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> $message
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5674,7 +5674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> E_USER_DEPRECATED
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5685,7 +5685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> $message
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5695,7 +5695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> E_USER_DEPRECATED
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5786,11 +5786,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</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 $function The function that was called.
- * @param string $message A message explaining what has been done incorrectly.
- * @param string $version The version of WordPress where the message was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $message A message explaining what has been done incorrectly.
+ * @param string $version The version of WordPress where the message was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _doing_it_wrong( $function, $message, $version ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _doing_it_wrong( $function_name, $message, $version ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when the given function is being used incorrectly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5797,24 +5797,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.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 $function The function that was called.
- * @param string $message A message explaining what has been done incorrectly.
- * @param string $version The version of WordPress where the message was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $function_name The function that was called.
+ * @param string $message A message explaining what has been done incorrectly.
+ * @param string $version The version of WordPress where the message was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'doing_it_wrong_run', $function, $message, $version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'doing_it_wrong_run', $function_name, $message, $version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to trigger an error for _doing_it_wrong() calls.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.1.0 Added the $function, $message and $version parameters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.1.0 Added the $function_name, $message and $version parameters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $trigger Whether to trigger the error for _doing_it_wrong() calls. Default true.
- * @param string $function The function that was called.
- * @param string $message A message explaining what has been done incorrectly.
- * @param string $version The version of WordPress where the message was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $trigger Whether to trigger the error for _doing_it_wrong() calls. Default true.
+ * @param string $function_name The function that was called.
+ * @param string $message A message explaining what has been done incorrectly.
+ * @param string $version The version of WordPress where the message was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true, $function, $message, $version ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true, $function_name, $message, $version ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Version number. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5831,7 +5831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Function %1$s was called <strong>incorrectly</strong>. %2$s %3$s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $message,
</span><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5850,7 +5850,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Function %1$s was called <strong>incorrectly</strong>. %2$s %3$s',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $function,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $function_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> $message,
</span><span class="cx" style="display: block; padding: 0 10px"> $version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5881,11 +5881,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_apache
</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 $mod The module, e.g. mod_rewrite.
- * @param bool $default Optional. The default return value if the module is not found. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $mod The module, e.g. mod_rewrite.
+ * @param bool $default_value Optional. The default return value if the module is not found. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the specified module is loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function apache_mod_loaded( $mod, $default = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function apache_mod_loaded( $mod, $default_value = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $is_apache;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_apache ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5915,7 +5915,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">- return $default;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $default_value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7288,23 +7288,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters/validates a variable as a boolean.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Alternative to `filter_var( $var, FILTER_VALIDATE_BOOLEAN )`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Alternative to `filter_var( $value, FILTER_VALIDATE_BOOLEAN )`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.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 mixed $var Boolean value to validate.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $value Boolean value to validate.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the value is validated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_validate_boolean( $var ) {
- if ( is_bool( $var ) ) {
- return $var;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_validate_boolean( $value ) {
+ if ( is_bool( $value ) ) {
+ return $value;
</ins><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">- if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $value ) && 'false' === strtolower( $value ) ) {
</ins><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">- return (bool) $var;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (bool) $value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>