diff options
Diffstat (limited to 'modules/field_ui')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 4 | ||||
| -rw-r--r-- | modules/field_ui/field_ui.module | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index bb7c01669..eec5cb525 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -1205,7 +1205,7 @@ function field_ui_default_value_widget($field, $instance, &$form, &$form_state) 'instance' => $instance, ), ); - function_exists('field_default_form'); + drupal_function_exists('field_default_form'); // @todo Allow multiple values (requires more work on 'add more' JS handler). $widget_form = field_default_form(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state, 0); $form['instance']['default_value_widget'] += $widget_form; @@ -1257,7 +1257,7 @@ function field_ui_field_edit_form_validate($form, &$form_state) { // Widget now does its own validation, should be no need to add anything // for widget validation here. - if (function_exists($field_function)) { + if (drupal_function_exists($field_function)) { $field_function('validate', $node, $field, $default_value, $form, NULL); } // The field validation routine won't set an error on the right field, so diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module index 3a26c8392..00db4681c 100644 --- a/modules/field_ui/field_ui.module +++ b/modules/field_ui/field_ui.module @@ -38,7 +38,6 @@ function field_ui_menu() { 'page callback' => 'field_ui_fields_list', 'access arguments' => array('administer content types'), 'type' => MENU_NORMAL_ITEM, - 'file' => 'field_ui.admin.inc', ); // Ensure the following is not executed until field_bundles is working and @@ -61,7 +60,6 @@ function field_ui_menu() { 'page arguments' => array('field_ui_field_overview_form', $obj_type, $bundle_arg), 'type' => MENU_LOCAL_TASK, 'weight' => 1, - 'file' => 'field_ui.admin.inc', ) + $access; $instance_position = count(explode('/', $path)) + 1; $items["$path/fields/%field_ui_menu"] = array( @@ -71,7 +69,6 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_edit_form', $obj_type, $bundle_arg, $instance_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', ) + $access; $items["$path/fields/%field_ui_menu/edit"] = array( 'title' => 'Edit instance settings', @@ -79,7 +76,6 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_edit_form', $obj_type, $bundle_arg, $instance_position), 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', ) + $access; $items["$path/fields/%field_ui_menu/field-settings"] = array( 'title' => 'Edit field settings', @@ -87,7 +83,6 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_settings_form', $obj_type, $bundle_arg, $instance_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', ) + $access; $items["$path/fields/%field_ui_menu/widget-type"] = array( 'title' => 'Change widget type', @@ -95,7 +90,6 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_widget_type_form', $obj_type, $bundle_arg, $instance_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', ) + $access; $items["$path/fields/%field_ui_menu/delete"] = array( 'title' => 'Delete instance', @@ -103,7 +97,6 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_delete_form', $obj_type, $bundle_arg, $instance_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', ) + $access; // 'Display fields' tab and context secondary tabs. @@ -113,7 +106,6 @@ function field_ui_menu() { 'page arguments' => array('field_ui_display_overview_form', $obj_type, $bundle_arg), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'field_ui.admin.inc', ) + $access; $tabs = field_ui_build_modes_tabs($obj_type); foreach ($tabs as $key => $tab) { @@ -122,7 +114,6 @@ function field_ui_menu() { 'page arguments' => array('field_ui_display_overview_form', $obj_type, $bundle_arg, $key), 'type' => $key == 'basic' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, 'weight' => $key == 'basic' ? 0 : 1, - 'file' => 'field_ui.admin.inc', ) + $access; } } |