Commit b54ff2c8 authored by Dries's avatar Dries
Browse files

- Patch #702816 by yched, tstoeckler: mention of content types when it should be bundles.

parent 242c47de
...@@ -31,7 +31,7 @@ function field_ui_fields_list() { ...@@ -31,7 +31,7 @@ function field_ui_fields_list() {
$rows[$field_name]['data'][2] = implode(', ', $cell['data'][2]); $rows[$field_name]['data'][2] = implode(', ', $cell['data'][2]);
} }
if (empty($rows)) { if (empty($rows)) {
$output = t('No fields have been defined for any content type yet.'); $output = t('No fields have been defined yet.');
} }
else { else {
// Sort rows by field name. // Sort rows by field name.
...@@ -432,7 +432,7 @@ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) { ...@@ -432,7 +432,7 @@ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) {
*/ */
function _field_ui_field_overview_form_validate_add_existing($form, &$form_state) { function _field_ui_field_overview_form_validate_add_existing($form, &$form_state) {
// The form element might be absent if no existing fields can be added to // The form element might be absent if no existing fields can be added to
// this content type // this bundle.
if (isset($form_state['values']['_add_existing_field'])) { if (isset($form_state['values']['_add_existing_field'])) {
$field = $form_state['values']['_add_existing_field']; $field = $form_state['values']['_add_existing_field'];
...@@ -1077,7 +1077,7 @@ function field_ui_widget_type_form_submit($form, &$form_state) { ...@@ -1077,7 +1077,7 @@ function field_ui_widget_type_form_submit($form, &$form_state) {
} }
/** /**
* Menu callback; present a form for removing a field from a content type. * Menu callback; present a form for removing a field instance from a bundle.
*/ */
function field_ui_field_delete_form($form, &$form_state, $instance) { function field_ui_field_delete_form($form, &$form_state, $instance) {
$bundle = $instance['bundle']; $bundle = $instance['bundle'];
...@@ -1107,7 +1107,9 @@ function field_ui_field_delete_form($form, &$form_state, $instance) { ...@@ -1107,7 +1107,9 @@ function field_ui_field_delete_form($form, &$form_state, $instance) {
} }
/** /**
* Remove a field from a content type. * Removes a field instance from a bundle.
*
* If the field has no more instances, it will be marked as deleted too.
*/ */
function field_ui_field_delete_form_submit($form, &$form_state) { function field_ui_field_delete_form_submit($form, &$form_state) {
$form_values = $form_state['values']; $form_values = $form_state['values'];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment