diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-13 06:41:23 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-13 06:41:23 +0000 |
| commit | 7e99fdd222b50a3e833ce9fed5173f9a58e44e9e (patch) | |
| tree | f68bd87ca23e2de98053d7cad99a99b5f1f2bf78 | |
| parent | 37b627c793fc84fb851fc3dd99544f803b151609 (diff) | |
| download | brdo-7e99fdd222b50a3e833ce9fed5173f9a58e44e9e.tar.gz brdo-7e99fdd222b50a3e833ce9fed5173f9a58e44e9e.tar.bz2 | |
#734234 by quicksketch, moonray, Melissamcewen, ekes, flobruit: Fixed Radio buttons throw warning in element_children() if keyed with '' (empty string).
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/form.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index dc4624d6c..71805afac 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -5548,7 +5548,7 @@ function element_children(&$elements, $sort = FALSE) { $children = array(); $sortable = FALSE; foreach ($elements as $key => $value) { - if ($key[0] !== '#') { + if ($key === '' || $key[0] !== '#') { $children[$key] = $value; if (is_array($value) && isset($value['#weight'])) { $sortable = TRUE; diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index ce4bc9681..c3ef7fd9d 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -50,7 +50,7 @@ class FormsTestCase extends DrupalWebTestCase { $elements['textarea']['element'] = array('#title' => $this->randomName(), '#type' => 'textarea'); $elements['textarea']['empty_values'] = $empty_strings; - $elements['radios']['element'] = array('#title' => $this->randomName(), '#type' => 'radios', '#options' => array($this->randomName(), $this->randomName(), $this->randomName())); + $elements['radios']['element'] = array('#title' => $this->randomName(), '#type' => 'radios', '#options' => array('' => t('None'), $this->randomName(), $this->randomName(), $this->randomName())); $elements['radios']['empty_values'] = $empty_arrays; $elements['checkbox']['element'] = array('#title' => $this->randomName(), '#type' => 'checkbox', '#required' => TRUE, '#title' => $this->randomName()); @@ -59,7 +59,7 @@ class FormsTestCase extends DrupalWebTestCase { $elements['checkboxes']['element'] = array('#title' => $this->randomName(), '#type' => 'checkboxes', '#options' => array($this->randomName(), $this->randomName(), $this->randomName())); $elements['checkboxes']['empty_values'] = $empty_arrays; - $elements['select']['element'] = array('#title' => $this->randomName(), '#type' => 'select', '#options' => array($this->randomName(), $this->randomName(), $this->randomName())); + $elements['select']['element'] = array('#title' => $this->randomName(), '#type' => 'select', '#options' => array('' => t('None'), $this->randomName(), $this->randomName(), $this->randomName())); $elements['select']['empty_values'] = $empty_strings; $elements['file']['element'] = array('#title' => $this->randomName(), '#type' => 'file'); |