<!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>[48065] trunk/src/wp-includes: Coding Standards: Rename the `$clean` or `$ids` variable in several functions to `$non_cached_ids` for clarity.</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/48065">48065</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/48065","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-16 19:07:04 +0000 (Tue, 16 Jun 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Rename the `$clean` or `$ids` variable in several functions to `$non_cached_ids` for clarity.
* `_get_non_cached_ids()`
* `update_meta_cache()`
* `update_object_term_cache()`
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-06-16 18:38:53 UTC (rev 48064)
+++ trunk/src/wp-includes/functions.php 2020-06-16 19:07:04 UTC (rev 48065)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6359,16 +6359,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int[] Array of IDs not present in the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_non_cached_ids( $object_ids, $cache_key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clean = array();
- $cache_values = wp_cache_get_multiple( $object_ids, $cache_key );
- foreach ( $cache_values as $id => $cache_value ) {
- $id = (int) $id;
- if ( ! $cache_value ) {
- $clean[] = $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $non_cached_ids = array();
+ $cache_values = wp_cache_get_multiple( $object_ids, $cache_key );
+
+ foreach ( $cache_values as $id => $value ) {
+ if ( ! $value ) {
+ $non_cached_ids[] = (int) $id;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $clean;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $non_cached_ids;
</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>
<a id="trunksrcwpincludesmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-06-16 18:38:53 UTC (rev 48064)
+++ trunk/src/wp-includes/meta.php 2020-06-16 19:07:04 UTC (rev 48065)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,24 +926,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) $check;
</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">- $cache_key = $meta_type . '_meta';
- $ids = array();
- $cache = array();
- $cache_values = wp_cache_get_multiple( $object_ids, $cache_key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_key = $meta_type . '_meta';
+ $non_cached_ids = array();
+ $cache = array();
+ $cache_values = wp_cache_get_multiple( $object_ids, $cache_key );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cache_values as $id => $cached_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $cached_object ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids[] = $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $non_cached_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache[ $id ] = $cached_object;
</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">- if ( empty( $ids ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $non_cached_ids ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $cache;
</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"> // Get meta info.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_list = join( ',', $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_list = join( ',', $non_cached_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,7 +968,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">- foreach ( $ids as $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $non_cached_ids as $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $cache[ $id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache[ $id ] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-06-16 18:38:53 UTC (rev 48064)
+++ trunk/src/wp-includes/taxonomy.php 2020-06-16 19:07:04 UTC (rev 48065)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3268,14 +3268,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = implode( ', ', $tt_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $wpdb->get_results( "SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)" );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies[] = $term->taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> $ids[] = $term->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $term->term_id, 'terms' );
</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"> $taxonomies = array_unique( $taxonomies );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array( $taxonomy );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $id, 'terms' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3405,27 +3408,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $object_ids = explode( ',', $object_ids );
</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">- $object_ids = array_map( 'intval', $object_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_ids = array_map( 'intval', $object_ids );
+ $non_cached_ids = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = get_object_taxonomies( $object_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_values = wp_cache_get_multiple( (array) $object_ids, "{$taxonomy}_relationships" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $cache_values as $key => $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach ( $cache_values as $id => $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids[] = $key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $non_cached_ids[] = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $ids ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $non_cached_ids ) ) {
</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><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $non_cached_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomies,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3439,7 +3443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $object_terms[ $term->object_id ][ $term->taxonomy ][] = $term->term_id;
</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">- foreach ( $ids as $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $non_cached_ids as $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $object_terms[ $id ][ $taxonomy ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $object_terms[ $id ] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>