diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 19 | ||||
| -rw-r--r-- | includes/form.inc | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/includes/common.inc b/includes/common.inc index 295a435e6..75f6f820b 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4424,25 +4424,16 @@ function element_info($type) { if (!isset($cache)) { $basic_defaults = element_basic_defaults(); - $cache = array(); - - foreach (module_implements('elements') as $module) { - $elements = module_invoke($module, 'elements'); - if (isset($elements) && is_array($elements)) { - $cache = array_merge_recursive($cache, $elements); - } - } - if (!empty($cache)) { - foreach ($cache as $element_type => $info) { - $cache[$element_type] = array_merge_recursive($basic_defaults, $info); - $cache[$element_type]['#type'] = $element_type; - } + $cache = module_invoke_all('element_info'); + foreach ($cache as $element_type => $info) { + $cache[$element_type] = array_merge_recursive($basic_defaults, $info); + $cache[$element_type]['#type'] = $element_type; } // Allow modules to alter the element type defaults. drupal_alter('element_info', $cache); } - return $cache[$type]; + return isset($cache[$type]) ? $cache[$type] : array(); } /** diff --git a/includes/form.inc b/includes/form.inc index 198f77a77..a80460477 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -1932,7 +1932,7 @@ function form_process_radios($element) { * $form_state['values']['body_format'] = 1; * @endcode * - * @see system_elements(), filter_form() + * @see system_element_info(), filter_form() */ function form_process_text_format($element) { if (isset($element['#text_format'])) { |