diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-18 04:50:08 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-18 04:50:08 +0000 |
| commit | bba83fc6846b1530be180fb56a060fd31d4d13cc (patch) | |
| tree | 1d17327ba18c3467bef8572b8bcf4f015d378689 /modules/taxonomy/taxonomy.module | |
| parent | 001b22269b90f60d1e627e324be2748c572df4f5 (diff) | |
| download | brdo-bba83fc6846b1530be180fb56a060fd31d4d13cc.tar.gz brdo-bba83fc6846b1530be180fb56a060fd31d4d13cc.tar.bz2 | |
#606114 by catch: taxonomy_field_formatter_load() should use taxonomy_term_load_multiple().
Diffstat (limited to 'modules/taxonomy/taxonomy.module')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 831c128a3..69025f6bb 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1151,16 +1151,7 @@ function taxonomy_field_formatter_prepare_view($obj_type, $objects, $field, $ins } } if ($tids) { - $terms = array(); - - // Avoid calling taxonomy_term_load_multiple because it could lead to - // circular references. - $query = db_select('taxonomy_term_data', 't'); - $query->fields('t'); - $query->condition('t.tid', $tids, 'IN'); - $query->addTag('translatable'); - $query->addTag('term_access'); - $terms = $query->execute()->fetchAllAssoc('tid'); + $terms = taxonomy_term_load_multiple($tids); // Iterate through the fieldable entities again to attach the loaded term data. foreach ($objects as $id => $object) { |