Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.414.2.11
diff -r1.414.2.11 taxonomy.module
588a589,592
>       // Our taxonomy term has already been converted to an object, leave it as is
>       elseif (is_object($term)) {
>         $taxonomy[(int) $term->tid] = $term;
>       }
