Changeset 48065

Timestamp:

06/16/2020 07:07:04 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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 #49542.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• meta.php (modified) (3 diffs)
• taxonomy.php (modified) (5 diffs)

trunk/src/wp-includes/functions.php

@@ -6360 +6360 @@
  */
 function _get_non_cached_ids( $object_ids, $cache_key ) {
-    $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;
-        }
-    }
-
-    return $clean;
+    $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;
+        }
+    }
+
+    return $non_cached_ids;
 }
 

trunk/src/wp-includes/meta.php

@@ -927 +927 @@
     }
 
-    $cache_key    = $meta_type . '_meta';
-    $ids          = array();
-    $cache        = array();
-    $cache_values = wp_cache_get_multiple( $object_ids, $cache_key );
+    $cache_key      = $meta_type . '_meta';
+    $non_cached_ids = array();
+    $cache          = array();
+    $cache_values   = wp_cache_get_multiple( $object_ids, $cache_key );
+
     foreach ( $cache_values as $id => $cached_object ) {
         if ( false === $cached_object ) {
-            $ids[] = $id;
+            $non_cached_ids[] = $id;
         } else {
             $cache[ $id ] = $cached_object;
@@ -939 +940 @@
     }
 
-    if ( empty( $ids ) ) {
+    if ( empty( $non_cached_ids ) ) {
         return $cache;
     }
 
     // Get meta info.
-    $id_list   = join( ',', $ids );
+    $id_list   = join( ',', $non_cached_ids );
     $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
 
@@ -968 +969 @@
     }
 
-    foreach ( $ids as $id ) {
+    foreach ( $non_cached_ids as $id ) {
         if ( ! isset( $cache[ $id ] ) ) {
             $cache[ $id ] = array();

trunk/src/wp-includes/taxonomy.php

@@ -3269 +3269 @@
         $terms  = $wpdb->get_results( "SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)" );
         $ids    = array();
+
         foreach ( (array) $terms as $term ) {
             $taxonomies[] = $term->taxonomy;
@@ -3274 +3275 @@
             wp_cache_delete( $term->term_id, 'terms' );
         }
+
         $taxonomies = array_unique( $taxonomies );
     } else {
         $taxonomies = array( $taxonomy );
+
         foreach ( $taxonomies as $taxonomy ) {
             foreach ( $ids as $id ) {
@@ -3406 +3409 @@
     }
 
-    $object_ids = array_map( 'intval', $object_ids );
+    $object_ids     = array_map( 'intval', $object_ids );
+    $non_cached_ids = array();
 
     $taxonomies = get_object_taxonomies( $object_type );
 
-    $ids = array();
     foreach ( $taxonomies as $taxonomy ) {
         $cache_values = wp_cache_get_multiple( (array) $object_ids, "{$taxonomy}_relationships" );
-        foreach ( $cache_values as $key => $value ) {
+
+        foreach ( $cache_values as $id => $value ) {
             if ( false === $value ) {
-                $ids[] = $key;
+                $non_cached_ids[] = $id;
                 break;
             }
@@ -3421 +3425 @@
     }
 
-    if ( empty( $ids ) ) {
+    if ( empty( $non_cached_ids ) ) {
         return false;
     }
 
     $terms = wp_get_object_terms(
-        $ids,
+        $non_cached_ids,
         $taxonomies,
         array(
@@ -3440 +3444 @@
     }
 
-    foreach ( $ids as $id ) {
+    foreach ( $non_cached_ids as $id ) {
         foreach ( $taxonomies as $taxonomy ) {
             if ( ! isset( $object_terms[ $id ][ $taxonomy ] ) ) {