Changeset 14495

Timestamp:

05/07/2010 03:24:47 AM (16 years ago)

Author:

nacin

Message:

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.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -2934 +2934 @@
     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;
+        }
     }