From f8e430c7fdbd97a4d7451f4c94e5cb67183dab42 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 19 Aug 2009 22:46:05 +0000
Subject: [PATCH] #552084 by jhodgdon: Removed references to 'CCK' in core.
---
CHANGELOG.txt | 2 +-
modules/field/field.module | 6 ++----
modules/node/node.install | 2 +-
modules/simpletest/tests/field_test.module | 8 ++------
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cb879faf5462..0c1e7f085fcb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -137,7 +137,7 @@ Drupal 7.0, xxxx-xx-xx (development version)
being a hard-coded property of node objects.
* In addition, any other object type may register with Field API
and allow custom data fields to be attached to itself.
- * Provides a subset of the features of the Content Construction
+ * Provides most of the features of the former Content Construction
Kit (CCK) module.
* Taxonomy terms are now Field API fields that can be added to any fieldable
object.
diff --git a/modules/field/field.module b/modules/field/field.module
index e1e03b554e9c..94aa34efef19 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -37,8 +37,7 @@
* - @link field_crud Field CRUD API @endlink. Create, updates, and
* deletes fields, bundles (a.k.a. "content types"), and instances.
* Modules use this API, often in hook_install(), to create
- * custom data structures. The Content Construction Kit
- * user-interface module uses this API for its major functionality.
+ * custom data structures.
*
* - @link field_attach Field Attach API @endlink. Connects object
* types to the Field API. Field Attach API functions load, store,
@@ -135,7 +134,6 @@ function field_help($path, $arg) {
switch ($path) {
case 'admin/help#field':
$output = '<p>' . t('The Field API allows custom data fields to be attached to Drupal objects and takes care of storing, loading, editing, and rendering field data. Any object type (node, user, etc.) can use the Field API to make itself "fieldable" and thus allow fields to be attached to it.') . '</p>';
- $output .= '<p>' . t('The Field API provides no user interface on its own. Use the Content Construction Kit (CCK) contrib module to manage custom fields via a web browser.') . '</p>';
return $output;
}
}
@@ -474,7 +472,7 @@ function _field_filter_xss_display_allowed_tags() {
*
* TODO D7 : do we still need field_format ?
* - backwards compatibility of templates - check what fallbacks we can propose...
- * - used by Views integration in CCK D6
+ * - was used by Views integration in CCK in D6 - do we need now?
* At least needs a little rehaul/update...
*
* Used to display a field's values outside the context of the $node, as
diff --git a/modules/node/node.install b/modules/node/node.install
index d83e2723f190..ddb571ebd8d6 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -330,7 +330,7 @@ function node_schema() {
'default' => '',
),
'custom' => array(
- 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via a module like the Content Construction Kit (TRUE).',
+ 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via Add content type (TRUE).',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
diff --git a/modules/simpletest/tests/field_test.module b/modules/simpletest/tests/field_test.module
index 524a74ac9e14..75dee80de098 100644
--- a/modules/simpletest/tests/field_test.module
+++ b/modules/simpletest/tests/field_test.module
@@ -424,7 +424,7 @@ function field_test_field_is_empty($item, $field) {
/**
* Implement hook_field_widget_info().
*
- * Here we indicate that the content module will handle
+ * Here we indicate that the field module will handle
* the default value and multiple values for these widgets.
*
* Callbacks can be omitted if default handing is used.
@@ -464,11 +464,7 @@ function field_test_field_widget_info() {
* plugged into any module that can provide it with valid
* $field information.
*
- * Content module will set the weight, field name and delta values
- * for each form element. This is a change from earlier CCK versions
- * where the widget managed its own multiple values.
- *
- * If there are multiple values for this field, the content module will
+ * If there are multiple values for this field, the field module will
* call this function as many times as needed.
*
* @param $form
--
GitLab