diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.api.php | 8 | ||||
| -rw-r--r-- | modules/field/field.attach.inc | 2 | ||||
| -rw-r--r-- | modules/field/field.default.inc | 2 | ||||
| -rw-r--r-- | modules/field/field.form.inc | 4 | ||||
| -rw-r--r-- | modules/field/modules/list/list.module | 4 | ||||
| -rw-r--r-- | modules/field/modules/number/number.module | 8 | ||||
| -rw-r--r-- | modules/field/modules/options/options.module | 4 | ||||
| -rw-r--r-- | modules/field/modules/text/text.module | 10 | ||||
| -rw-r--r-- | modules/field/tests/field_test.field.inc | 8 |
9 files changed, 25 insertions, 25 deletions
diff --git a/modules/field/field.api.php b/modules/field/field.api.php index ae4f91c34..46bdfe91b 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -525,7 +525,7 @@ function hook_field_is_empty($item, $field) { * Widget hooks are typically called by the Field Attach API during the * creation of the field form structure with field_attach_form(). * @see hook_field_widget_info_alter(). - * @see hook_field_widget(). + * @see hook_field_widget_form(). * @see hook_field_widget_error(). * * @return @@ -649,7 +649,7 @@ function hook_field_widget_info_alter(&$info) { * @return * The form elements for a single widget for this field. */ -function hook_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { +function hook_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { $element += array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : '', @@ -684,7 +684,7 @@ function hook_field_widget_error($element, $error) { * * @see hook_field_formatter_info(). * @see hook_field_formatter_info_alter(). - * @see hook_field_formatter(). + * @see hook_field_formatter_view(). * @see hook_field_formatter_prepare_view(). * * @return @@ -816,7 +816,7 @@ function hook_field_formatter_prepare_view($obj_type, $objects, $field, $instanc * A renderable array for the $items, as an array of child elements keyed * by numeric indexes starting from 0. */ -function hook_field_formatter($obj_type, $object, $field, $instance, $langcode, $items, $display) { +function hook_field_formatter_view($obj_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); $settings = $display['settings']; diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index d87ac3a1a..ef26af253 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -1144,7 +1144,7 @@ function field_attach_prepare_view($obj_type, $objects, $build_mode = 'full') { * '#formatter' => the name of the formatter, * '#items' => the field values being displayed, * // The element's children are the formatted values returned by - * // hook_field_formatter(). + * // hook_field_formatter_view(). * ), * ); * @endcode diff --git a/modules/field/field.default.inc b/modules/field/field.default.inc index 4e7dca6cb..2914abc1e 100644 --- a/modules/field/field.default.inc +++ b/modules/field/field.default.inc @@ -187,7 +187,7 @@ function field_default_view($obj_type, $object, $field, $instance, $langcode, $i // Calling the formatter function through module_invoke() can have a // performance impact on pages with many fields and values. - $function = $display['module'] . '_field_formatter'; + $function = $display['module'] . '_field_formatter_view'; if (function_exists($function)) { $elements = $function($obj_type, $object, $field, $instance, $langcode, $items, $display); } diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index 287604119..0970c1a6a 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -47,7 +47,7 @@ function field_default_form($obj_type, $object, $field, $instance, $langcode, $i // make it the $delta value. else { $delta = isset($get_delta) ? $get_delta : 0; - $function = $instance['widget']['module'] . '_field_widget'; + $function = $instance['widget']['module'] . '_field_widget_form'; if (function_exists($function)) { $element = array( '#object_type' => $instance['object_type'], @@ -161,7 +161,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, $wrapper_id = drupal_html_class($field_name) . '-wrapper'; $field_elements = array(); - $function = $instance['widget']['module'] . '_field_widget'; + $function = $instance['widget']['module'] . '_field_widget_form'; if (function_exists($function)) { for ($delta = 0; $delta <= $max; $delta++) { $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module index 29e4ea4d2..c5fe39110 100644 --- a/modules/field/modules/list/list.module +++ b/modules/field/modules/list/list.module @@ -330,9 +330,9 @@ function list_field_formatter_info() { } /** - * Implements hook_field_formatter(). + * Implements hook_field_formatter_view(). */ -function list_field_formatter($object_type, $object, $field, $instance, $langcode, $items, $display) { +function list_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); switch ($display['type']) { diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module index 88db4eb3e..25bff0316 100644 --- a/modules/field/modules/number/number.module +++ b/modules/field/modules/number/number.module @@ -253,9 +253,9 @@ function number_field_formatter_info() { } /** - * Implements hook_field_formatter(). + * Implements hook_field_formatter_view(). */ -function number_field_formatter($object_type, $object, $field, $instance, $langcode, $items, $display) { +function number_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); $settings = $display['settings']; @@ -298,9 +298,9 @@ function number_field_widget_info() { } /** - * Implements hook_field_widget(). + * Implements hook_field_widget_form(). */ -function number_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { +function number_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { $value = isset($items[$delta]['value']) ? $items[$delta]['value'] : ''; // Substitute the decimal separator. if ($field['type'] == 'number_decimal' || $field['type'] == 'number_float') { diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module index 78a32e2ca..d4c6c8f9e 100644 --- a/modules/field/modules/options/options.module +++ b/modules/field/modules/options/options.module @@ -66,9 +66,9 @@ function options_field_widget_info() { } /** - * Implements hook_field_widget(). + * Implements hook_field_widget_form(). */ -function options_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { +function options_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { // Abstract over the actual field columns, to allow different field types to // reuse those widgets. $value_key = key($field['columns']); diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 68a197005..7feacb1dd 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -199,7 +199,7 @@ function text_field_validate($obj_type, $object, $field, $instance, $langcode, $ * Where possible, generate the sanitized version of each field early so that * it is cached in the field cache. This avoids looking up from the filter cache * separately. - * @see text_field_formatter(). + * @see text_field_formatter_view(). */ function text_field_load($obj_type, $objects, $field, $instances, $langcode, &$items) { foreach ($objects as $id => $object) { @@ -262,9 +262,9 @@ function text_field_formatter_info() { } /** - * Implements hook_field_formatter(). + * Implements hook_field_formatter_view(). */ -function text_field_formatter($object_type, $object, $field, $instance, $langcode, $items, $display) { +function text_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); switch ($display['type']) { @@ -508,9 +508,9 @@ function text_field_widget_settings_form($field, $instance) { } /** - * Implements hook_field_widget(). + * Implements hook_field_widget_form(). */ -function text_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $base) { +function text_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $base) { $element = $base; switch ($instance['widget']['type']) { diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc index 8db03401c..a66273a19 100644 --- a/modules/field/tests/field_test.field.inc +++ b/modules/field/tests/field_test.field.inc @@ -154,9 +154,9 @@ function field_test_field_widget_info() { } /** - * Implements hook_field_widget(). + * Implements hook_field_widget_form(). */ -function field_test_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { +function field_test_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { switch ($instance['widget']['type']) { case 'test_field_widget': $element += array( @@ -277,9 +277,9 @@ function field_test_field_formatter_prepare_view($obj_type, $objects, $field, $i } /** - * Implements hook_field_formatter(). + * Implements hook_field_formatter_view(). */ -function field_test_field_formatter($object_type, $object, $field, $instance, $langcode, $items, $display) { +function field_test_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { $element = array(); $settings = $display['settings']; |