diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-08-23 05:04:05 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-08-23 05:04:05 +0000 |
| commit | 32e22f1f9a69618ba94e2015cf4f9d5c8ebb80e1 (patch) | |
| tree | e11bd40e74496c8cf7d35670fc7debf666bbed3c | |
| parent | 4fdc90e1d24701d22a7734d83e7b73b9861b0438 (diff) | |
| download | brdo-32e22f1f9a69618ba94e2015cf4f9d5c8ebb80e1.tar.gz brdo-32e22f1f9a69618ba94e2015cf4f9d5c8ebb80e1.tar.bz2 | |
#79577 by chx. Cleanup- remove $posted and only set $edit if needed.
| -rw-r--r-- | includes/form.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/includes/form.inc b/includes/form.inc index 8c4eec84a..ae4397e93 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -494,13 +494,12 @@ function form_builder($form_id, $form) { $form['#id'] = 'edit-' . implode('-', $form['#parents']); } - $posted = (($form['#programmed']) || ((!isset($form['#access']) || $form['#access']) && isset($_POST['edit']) && ($_POST['edit']['form_id'] == $form_id))); - $edit = $posted ? $form['#post']['edit'] : array(); - foreach ($form['#parents'] as $parent) { - $edit = isset($edit[$parent]) ? $edit[$parent] : NULL; - } if (!isset($form['#value']) && !array_key_exists('#value', $form)) { - if ($posted) { + if (($form['#programmed']) || ((!isset($form['#access']) || $form['#access']) && isset($_POST['edit']) && ($_POST['edit']['form_id'] == $form_id))) { + $edit = $form['#post']['edit']; + foreach ($form['#parents'] as $parent) { + $edit = isset($edit[$parent]) ? $edit[$parent] : NULL; + } switch ($form['#type']) { case 'checkbox': $form['#value'] = !empty($edit) ? $form['#return_value'] : 0; |