diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.attach.inc | 4 | ||||
| -rw-r--r-- | modules/field/field.form.inc | 8 | ||||
| -rw-r--r-- | modules/field/field.module | 11 | ||||
| -rw-r--r-- | modules/field/modules/list/list.module | 2 |
4 files changed, 14 insertions, 11 deletions
diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 51ee56b1f..f5f5de5b0 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -207,7 +207,7 @@ function _field_invoke($op, $obj_type, $object, &$a = NULL, &$b = NULL, $options // Invoke the field hook and collect results. $function = $options['default'] ? 'field_default_' . $op : $field['module'] . '_field_' . $op; - if (drupal_function_exists($function)) { + if (function_exists($function)) { // Iterate over all the field translations. foreach ($field_translations as $langcode => $items) { $result = $function($obj_type, $object, $field, $instance, $langcode, $items, $a, $b); @@ -336,7 +336,7 @@ function _field_invoke_multiple($op, $obj_type, $objects, &$a = NULL, &$b = NULL foreach ($fields as $field_id => $field) { $field_name = $field['field_name']; $function = $options['default'] ? 'field_default_' . $op : $field['module'] . '_field_' . $op; - if (drupal_function_exists($function)) { + if (function_exists($function)) { // Iterate over all the field translations. foreach ($grouped_items[$field_id] as $langcode => $items) { $results = $function($obj_type, $grouped_objects[$field_id], $field, $grouped_instances[$field_id], $langcode, $grouped_items[$field_id][$langcode], $options, $a, $b); diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index 088642daf..937b6d226 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -56,7 +56,7 @@ function field_default_form($obj_type, $object, $field, $instance, $langcode, $i else { $delta = isset($get_delta) ? $get_delta : 0; $function = $instance['widget']['module'] . '_field_widget'; - if (drupal_function_exists($function)) { + if (function_exists($function)) { if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { $defaults = array( '#required' => $get_delta > 0 ? FALSE : $instance['required'], @@ -155,7 +155,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, ); $function = $instance['widget']['module'] . '_field_widget'; - if (drupal_function_exists($function)) { + if (function_exists($function)) { for ($delta = 0; $delta <= $max; $delta++) { if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; @@ -295,7 +295,7 @@ function field_default_form_errors($obj_type, $object, $field, $instance, $langc $field_name = $field['field_name']; if (!empty($errors[$field_name][$langcode])) { $function = $instance['widget']['module'] . '_field_widget_error'; - $function_exists = drupal_function_exists($function); + $function_exists = function_exists($function); // Walk the form down to where the widget lives. $form_path = $form['#fields'][$field_name]['form_path']; @@ -330,7 +330,7 @@ function field_default_form_errors($obj_type, $object, $field, $instance, $langc */ function field_add_more_submit($form, &$form_state) { // Set the form to rebuild and run submit handlers. - if (isset($form['#builder_function']) && drupal_function_exists($form['#builder_function'])) { + if (isset($form['#builder_function']) && function_exists($form['#builder_function'])) { $entity = $form['#builder_function']($form, $form_state); // Make the changes we want to the form state. diff --git a/modules/field/field.module b/modules/field/field.module index f73acc360..5781ae116 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -11,9 +11,11 @@ * every page request. */ require(DRUPAL_ROOT . '/modules/field/field.crud.inc'); +require(DRUPAL_ROOT . '/modules/field/field.default.inc'); require(DRUPAL_ROOT . '/modules/field/field.info.inc'); require(DRUPAL_ROOT . '/modules/field/field.multilingual.inc'); require(DRUPAL_ROOT . '/modules/field/field.attach.inc'); +require(DRUPAL_ROOT . '/modules/field/field.form.inc'); /** * @defgroup field Field API @@ -164,6 +166,7 @@ function field_menu() { 'page callback' => 'field_add_more_js', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, + 'file' => 'field.form.inc', ); return $items; @@ -289,7 +292,7 @@ function field_get_default_value($obj_type, $object, $field, $instance, $langcod $items = array(); if (!empty($instance['default_value_function'])) { $function = $instance['default_value_function']; - if (drupal_function_exists($function)) { + if (function_exists($function)) { $items = $function($obj_type, $object, $field, $instance, $langcode); } } @@ -315,7 +318,7 @@ function field_get_default_value($obj_type, $object, $field, $instance, $langcod function field_set_empty($field, $items) { $function = $field['module'] . '_field_is_empty'; // We ensure the function is loaded, but explicitly break if it is missing. - drupal_function_exists($function); + function_exists($function); foreach ((array) $items as $delta => $item) { if ($function($item, $field)) { unset($items[$delta]); @@ -601,7 +604,7 @@ function field_view_field($obj_type, $object, $field, $instance, $build_mode = ' // One-field equivalent to _field_invoke('sanitize'). $function = $field['module'] . '_field_sanitize'; - if (drupal_function_exists($function)) { + if (function_exists($function)) { $function($obj_type, $object, $field, $instance, $items); $object->$field['field_name'] = $items; } @@ -723,4 +726,4 @@ function template_preprocess_field(&$variables) { /** * @} End of "defgroup field" - */
\ No newline at end of file + */ diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module index ad1335df0..4f9fbe917 100644 --- a/modules/field/modules/list/list.module +++ b/modules/field/modules/list/list.module @@ -151,7 +151,7 @@ function list_allowed_values($field) { $allowed_values[$field['field_name']] = array(); $function = $field['settings']['allowed_values_function']; - if (!empty($function) && drupal_function_exists($function)) { + if (!empty($function) && function_exists($function)) { $allowed_values[$field['field_name']] = $function($field); } elseif (!empty($field['settings']['allowed_values'])) { |