WordPress.org

Make WordPress Core

Changeset 7953


Ignore:
Timestamp:
05/19/08 18:47:48 (6 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/wp-includes/taxonomy.php

    r7763 r7953  
    10591059        foreach ( $taxonomies as $index => $taxonomy ) { 
    10601060            $t = get_taxonomy($taxonomy); 
    1061             if ( is_array($t->args) && $args != array_merge($args, $t->args) ) { 
     1061            if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) { 
    10621062                unset($taxonomies[$index]); 
    10631063                $terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args))); 
     
    10661066    } else { 
    10671067        $t = get_taxonomy($taxonomies[0]); 
    1068         if ( is_array($t->args) ) 
     1068        if ( isset($t->args) && is_array($t->args) ) 
    10691069            $args = array_merge($args, $t->args); 
    10701070    } 
Note: See TracChangeset for help on using the changeset viewer.