diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-12-21 13:47:32 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-12-21 13:47:32 +0000 |
| commit | d1c017660c1b620267fdcdf0a8400fb411c2dd70 (patch) | |
| tree | 8401e11dfb9b142f8507d985eb382599c5fa8099 /modules/taxonomy | |
| parent | ef10abde20c8052ca4dd6eec9ca84b6f74d37a11 (diff) | |
| download | brdo-d1c017660c1b620267fdcdf0a8400fb411c2dd70.tar.gz brdo-d1c017660c1b620267fdcdf0a8400fb411c2dd70.tar.bz2 | |
- Patch #658364 by effulgentsia: made the build/view/formatter terminology more consistent.
Diffstat (limited to 'modules/taxonomy')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 10 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index a96132c37..f886366a6 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1080,15 +1080,15 @@ function taxonomy_field_formatter_info() { } /** - * Implements hook_field_formatter(). + * Implements hook_field_formatter_view(). */ -function taxonomy_field_formatter($object_type, $object, $field, $instance, $langcode, $items, $display) { +function taxonomy_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); switch ($display['type']) { case 'taxonomy_term_link': foreach ($items as $delta => $item) { - // @todo Remove this when "node_build() does not call + // @todo Remove this when "node_view() does not call // field_attach_prepare_view()" bug is fixed. // See http://drupal.org/node/493314. if (!isset($item['taxonomy_term'])) { @@ -1228,9 +1228,9 @@ function taxonomy_term_title($term) { } /** - * Implements hook_field_widget(). + * Implements hook_field_widget_form(). */ -function taxonomy_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { +function taxonomy_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { $tags = array(); foreach ($items as $item) { $tags[$item['tid']] = isset($item['taxonomy_term']) ? $item['taxonomy_term'] : taxonomy_term_load($item['tid']); diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index 83c9c9870..999a2131a 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -41,7 +41,7 @@ function taxonomy_term_page($term) { ); if ($nids = taxonomy_select_nodes($term->tid, TRUE, variable_get('default_nodes_main', 10))) { $nodes = node_load_multiple($nids); - $build += node_build_multiple($nodes); + $build += node_view_multiple($nodes); $build['pager'] = array( '#markup' => theme('pager', array('tags' => NULL)), '#weight' => 5, |