diff options
| -rw-r--r-- | modules/field/field.api.php | 4 | ||||
| -rw-r--r-- | modules/field/field.form.inc | 4 | ||||
| -rw-r--r-- | modules/field/modules/number/number.module | 4 | ||||
| -rw-r--r-- | modules/field/modules/options/options.module | 2 | ||||
| -rw-r--r-- | modules/field/modules/text/text.module | 4 | ||||
| -rw-r--r-- | modules/simpletest/tests/field_test.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 |
7 files changed, 14 insertions, 8 deletions
diff --git a/modules/field/field.api.php b/modules/field/field.api.php index d6f29609d..4f4fa9dc8 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -620,6 +620,8 @@ function hook_field_widget_info_alter(&$info) { * The field structure. * @param $instance * The field instance. + * @param $langcode + * The language associated to $items. * @param $items * Array of default values for this field. * @param $delta @@ -627,7 +629,7 @@ function hook_field_widget_info_alter(&$info) { * @return * The form item for a single element for this field. */ -function hook_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function hook_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : '', diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index ccc55c789..3e1d47e08 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -57,7 +57,7 @@ function field_default_form($obj_type, $object, $field, $instance, $langcode, $i $delta = isset($get_delta) ? $get_delta : 0; $function = $instance['widget']['module'] . '_field_widget'; if (function_exists($function)) { - if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { + if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta)) { $defaults = array( '#required' => $get_delta > 0 ? FALSE : $instance['required'], '#columns' => array_keys($field['columns']), @@ -157,7 +157,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, $function = $instance['widget']['module'] . '_field_widget'; if (function_exists($function)) { for ($delta = 0; $delta <= $max; $delta++) { - if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { + if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta)) { $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; $defaults = array( // For multiple fields, title and description are handled by the wrapping table. diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module index 58eb3802e..c9d09428a 100644 --- a/modules/field/modules/number/number.module +++ b/modules/field/modules/number/number.module @@ -330,13 +330,15 @@ function number_elements() { * The field structure. * @param $instance * the field instance array + * @param $langcode + * The language associated to $items. * @param $delta * the order of this item in the array of subelements (0, 1, 2, etc) * * @return * the form item for a single element for this field */ -function number_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function number_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL, diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module index a49f5cd68..84e2e1615 100644 --- a/modules/field/modules/options/options.module +++ b/modules/field/modules/options/options.module @@ -98,7 +98,7 @@ function options_elements() { /** * Implement hook_field_widget(). */ -function options_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = NULL) { +function options_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = NULL) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => !empty($items) ? $items : array(), diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 914494256..5bbe87642 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -594,6 +594,8 @@ function text_elements() { * The field structure. * @param $instance * the field instance array + * @param $langcode + * The language associated to $items. * @param $items * array of default values for this field * @param $delta @@ -602,7 +604,7 @@ function text_elements() { * @return * the form item for a single element for this field */ -function text_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function text_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : '', diff --git a/modules/simpletest/tests/field_test.module b/modules/simpletest/tests/field_test.module index fce1e4735..5dd575477 100644 --- a/modules/simpletest/tests/field_test.module +++ b/modules/simpletest/tests/field_test.module @@ -495,7 +495,7 @@ function field_test_field_widget_info() { * @return * the form item for a single element for this field */ -function field_test_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function field_test_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = 0) { $element = array( 'value' => array( '#title' => $instance['label'], diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 0d1fde908..26ca368aa 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -2017,7 +2017,7 @@ function taxonomy_term_title($term) { /** * Implement hook_field_widget(). */ -function taxonomy_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = NULL) { +function taxonomy_field_widget(&$form, &$form_state, $field, $instance, $langcode, $items, $delta = NULL) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => !empty($items) ? $items : array(), |