Changeset 7953

Timestamp:

05/19/2008 06:47:48 PM (18 years ago)

Author:

ryan

Message:

Make sure taxonomy args are set before using. Props Sam_a. fixes #6960 for 2.5

File:

• branches/2.5/wp-includes/taxonomy.php (modified) (2 diffs)

branches/2.5/wp-includes/taxonomy.php

@@ -1059 +1059 @@
         foreach ( $taxonomies as $index => $taxonomy ) {
             $t = get_taxonomy($taxonomy);
-            if ( is_array($t->args) && $args != array_merge($args, $t->args) ) {
+            if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) {
                 unset($taxonomies[$index]);
                 $terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
@@ -1066 +1066 @@
     } else {
         $t = get_taxonomy($taxonomies[0]);
-        if ( is_array($t->args) )
+        if ( isset($t->args) && is_array($t->args) )
             $args = array_merge($args, $t->args);
     }