summaryrefslogtreecommitdiff
path: root/modules/field/tests
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-11 15:42:14 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-11 15:42:14 +0000
commit8d1f703f3a0148c35b67f470589d74e2b4cc96e5 (patch)
treefdd1305eaf29bc6206090157d0b330ac3561a91d /modules/field/tests
parent0b0b40297ce4ab1aee9a886e9bb80a69dc24cad1 (diff)
downloadbrdo-8d1f703f3a0148c35b67f470589d74e2b4cc96e5.tar.gz
brdo-8d1f703f3a0148c35b67f470589d74e2b4cc96e5.tar.bz2
#641670 by yched and sun: Move ['#field'] meta information into ().
Diffstat (limited to 'modules/field/tests')
-rw-r--r--modules/field/tests/field.test3
-rw-r--r--modules/field/tests/field_test.field.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index ca503002f..2109748f3 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -1148,6 +1148,9 @@ class FieldAttachOtherTestCase extends FieldAttachTestCase {
$values[1]['value'] = 0;
$langcode = LANGUAGE_NONE;
+ // Pretend the form has been built.
+ drupal_prepare_form('field_test_entity_form', $form, $form_state);
+ $form = form_builder('field_test_entity_form', $form, $form_state);
$form_state['values'] = array($this->field_name => array($langcode => $values));
field_attach_submit($entity_type, $entity, $form, $form_state);
diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc
index a66273a19..8793e22d2 100644
--- a/modules/field/tests/field_test.field.inc
+++ b/modules/field/tests/field_test.field.inc
@@ -194,7 +194,7 @@ function field_test_widget_multiple_validate($element, &$form_state) {
/**
* Implements hook_field_widget_error().
*/
-function field_test_field_widget_error($element, $error) {
+function field_test_field_widget_error($element, $error, $form, &$form_state) {
// @todo No easy way to differenciate widget types, we should receive it as a
// parameter.
if (isset($element['value'])) {