From d8e2d6d4a928b4513607833d72c7640fea9a753c Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 7 May 2010 03:24:47 +0000 Subject: [PATCH] Standardize returned array keys when output = 'names'. Return numeric keys. Standardizes get_object_taxonomies with get_taxonomies, get_post_types, and get_post_stati. props scribu. fixes #13109. git-svn-id: http://svn.automattic.com/wordpress/trunk@14495 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 4cc95a7fa..e86433b2e 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2933,8 +2933,12 @@ function wp_filter_object_list( $list, $args = array(), $operator = 'and', $fiel foreach ( $list as $key => $obj ) { $matched = count(array_intersect_assoc(get_object_vars($obj), $args)); - if ( ('and' == $operator && $matched == $count) || ('or' == $operator && $matched <= $count) ) - $filtered[$key] = $field ? $obj->$field : $obj; + if ( ('and' == $operator && $matched == $count) || ('or' == $operator && $matched <= $count) ) { + if ( $field ) + $filtered[] = $obj->$field; + else + $filtered[$key] = $obj; + } } return $filtered;