diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-06-02 13:47:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-06-02 13:47:26 +0000 |
| commit | 4f2e13f50376a9032f8157563aeb6eede34433eb (patch) | |
| tree | a8462d9bee26edcf648b4bf0de25b426c0ffcfd8 /modules | |
| parent | cbd22269f81552616377090f6fe9187fdeb656d9 (diff) | |
| download | brdo-4f2e13f50376a9032f8157563aeb6eede34433eb.tar.gz brdo-4f2e13f50376a9032f8157563aeb6eede34433eb.tar.bz2 | |
- Patch #422362 by JamesAn: convert form.inc to use new static caching API.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/field/field.form.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/form.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index f321d2dc7..4b15d2c42 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -392,7 +392,7 @@ function field_add_more_js($bundle_name, $field_name) { // Just grab the data we need. $form_state['values'] = $form_state_copy['values']; // Reset cached ids, so that they don't affect the actual form we output. - form_clean_id(NULL, TRUE); + drupal_static_reset('form_clean_id'); // Sort the $form_state['values'] we just built *and* the incoming $_POST data // according to d-n-d reordering. diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index 991186ba3..46bc67b84 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -306,7 +306,7 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase { // Clear errors and messages. drupal_get_messages(); - form_set_error(NULL, '', TRUE); + form_clear_error(); // Return the processed form together with form_state and errors // to allow the caller lowlevel access to the form. |