Ticket #5607: remove_admin_notices2.diff

wp-includes/taxonomy.php

@@ -506 +506 @@
  */
 function &get_terms($taxonomies, $args = '') {
         global $wpdb;
+        $empty_array = array();
 
         $single_taxonomy = false;
         if ( !is_array($taxonomies) ) {
@@ -545 +546 @@
         if ( $child_of ) {
                 $hierarchy = _get_term_hierarchy($taxonomies[0]);
                 if ( !isset($hierarchy[$child_of]) )
-                        return array();
+                        return $empty_array;
         }
 
         if ( $parent ) {
                 $hierarchy = _get_term_hierarchy($taxonomies[0]);
                 if ( !isset($hierarchy[$parent]) )
-                        return array();
+                        return $empty_array;
         }
 
         $key = md5( serialize( $args ) . serialize( $taxonomies ) );
@@ -1581 +1582 @@
  * @return bool|array Empty array if $terms found, but not $taxonomy. False if nothing is in cache for $taxonomy and $id.
  */
 function &get_object_term_cache($id, $taxonomy) {
-        return wp_cache_get($id, "{$taxonomy}_relationships");
+        $cache = wp_cache_get($id, "{$taxonomy}_relationships");
+        return $cache;
 }
 
 /**
@@ -1727 +1729 @@
  * @return array Empty if $terms is empty else returns full list of child terms.
  */
 function &_get_term_children($term_id, $terms, $taxonomy) {
+        $empty_array = array();
         if ( empty($terms) )
-                return array();
+                return $empty_array;
 
         $term_list = array();
         $has_children = _get_term_hierarchy($taxonomy);
 
         if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
-                return array();
+                return $empty_array;
 
         foreach ( $terms as $term ) {
                 $use_id = false;
@@ -1850 +1853 @@
         }
 }