Ticket #42691: 42691.diff

src/wp-includes/class-wp-term-query.php

@@ -288 +288 @@
                 return $this->get_terms();
         }
 
+    /**
+     * Maps the term id array to real term objects.
+     *
+     * @param array $terms
+     *
+     * @return array
+     */
+    private function map_terms( array $terms ) {
+        $terms = array_map( 'get_term', $terms );
+
+        // TODO change to anonymous functions if WordPress drops 5.2 support
+        return array_filter($terms, create_function('$value', 'return $value !== null;'));
+    }
+
         /**
          * Get terms, based on query_vars.
          *
@@ -677 +691 @@
                 $cache = wp_cache_get( $cache_key, 'terms' );
                 if ( false !== $cache ) {
                         if ( 'all' === $_fields ) {
-                                $cache = array_map( 'get_term', $cache );
+                $cache = $this->map_terms( $cache );
                         }
 
                         $this->terms = $cache;
@@ -809 +823 @@
                 wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
 
                 if ( 'all' === $_fields || 'all_with_object_id' === $_fields ) {
-                        $terms = array_map( 'get_term', $terms );
+                        $terms = $this->map_terms( $terms );
                 }
 
                 $this->terms = $terms;