summaryrefslogtreecommitdiff
path: root/modules/field_ui
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:02:05 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:02:05 +0000
commit4ae238ea577ed0140df6fd034b06bfd7b0f0cdb4 (patch)
tree91a4f64953675ba9204158ebca02276aec7555ba /modules/field_ui
parentc98fd96c62e6a60f5e5e2476ebc38766e438c535 (diff)
downloadbrdo-4ae238ea577ed0140df6fd034b06bfd7b0f0cdb4.tar.gz
brdo-4ae238ea577ed0140df6fd034b06bfd7b0f0cdb4.tar.bz2
*** empty log message ***
Diffstat (limited to 'modules/field_ui')
-rw-r--r--modules/field_ui/field_ui.admin.inc4
-rw-r--r--modules/field_ui/field_ui.module9
2 files changed, 11 insertions, 2 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index eec5cb525..bb7c01669 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,
),
);
- drupal_function_exists('field_default_form');
+ 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 (drupal_function_exists($field_function)) {
+ if (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 00db4681c..3a26c8392 100644
--- a/modules/field_ui/field_ui.module
+++ b/modules/field_ui/field_ui.module
@@ -38,6 +38,7 @@ 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
@@ -60,6 +61,7 @@ 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(
@@ -69,6 +71,7 @@ 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',
@@ -76,6 +79,7 @@ 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',
@@ -83,6 +87,7 @@ 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',
@@ -90,6 +95,7 @@ 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',
@@ -97,6 +103,7 @@ 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.
@@ -106,6 +113,7 @@ 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) {
@@ -114,6 +122,7 @@ 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;
}
}