- Patch #445044 by bjaspan, Damien Tournoud, chx, Berdir: remove the field autoload feature.

1 files changed, 18 insertions, 29 deletions

diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc
index e5db1b577..97e18fd61 100644
--- a/modules/field/field.info.inc
+++ b/modules/field/field.info.inc
@@ -197,17 +197,6 @@ function _field_info_collate_fields($reset = FALSE) {
 }
 
 /**
- * @} End of "defgroup field_info"
- *
- * The rest of the functions in this file are not in a group, but
- * their automatically-generated autoloaders are (see field.autoload.inc).
- */
-
-/**
- * @autoload field_(?:behaviors|info)_.* field_info FieldException {
- */
-
-/**
  *  Helper function for determining the behavior of a field
  *  with respect to a given operation.
  *
@@ -222,7 +211,7 @@ function _field_info_collate_fields($reset = FALSE) {
  *    FIELD_BEHAVIOR_CUSTOM  - use the field's callback function.
  *    FIELD_BEHAVIOR_DEFAULT - use field.module default behavior.
  */
-function _field_behaviors_field($op, $field) {
+function field_behaviors_field($op, $field) {
   $info = field_info_field_types($field['type']);
   return isset($info['behaviors'][$op]) ? $info['behaviors'][$op] : FIELD_BEHAVIOR_DEFAULT;
 }
@@ -241,7 +230,7 @@ function _field_behaviors_field($op, $field) {
  *    FIELD_BEHAVIOR_CUSTOM  - use the widget's callback function.
  *    FIELD_BEHAVIOR_DEFAULT - use field.module default behavior.
  */
-function _field_behaviors_widget($op, $instance) {
+function field_behaviors_widget($op, $instance) {
   $info = field_info_widget_types($instance['widget']['type']);
   return isset($info['behaviors'][$op]) ? $info['behaviors'][$op] : FIELD_BEHAVIOR_DEFAULT;
 }
@@ -260,7 +249,7 @@ function _field_behaviors_widget($op, $instance) {
  *    FIELD_BEHAVIOR_CUSTOM  - use the formatter's callback function.
  *    FIELD_BEHAVIOR_DEFAULT - use field module default behavior.
  */
-function _field_behaviors_formatter($op, $display) {
+function field_behaviors_formatter($op, $display) {
   $info = field_info_formatter_types($display['type']);
   return isset($info['behaviors'][$op]) ? $info['behaviors'][$op] : FIELD_BEHAVIOR_DEFAULT;
 }
@@ -275,7 +264,7 @@ function _field_behaviors_formatter($op, $display) {
  *   Either a field type description, as provided by hook_field_info(), or an
  *   array of all existing field types, keyed by field type name.
  */
-function _field_info_field_types($field_type = NULL) {
+function field_info_field_types($field_type = NULL) {
   $info = _field_info_collate_types();
   $field_types = $info['field types'];
   if ($field_type) {
@@ -299,7 +288,7 @@ function _field_info_field_types($field_type = NULL) {
  *   hook_field_widget_info(), or an array of all existing widget
  *   types, keyed by widget type name.
  */
-function _field_info_widget_types($widget_type = NULL) {
+function field_info_widget_types($widget_type = NULL) {
   $info = _field_info_collate_types();
   $widget_types = $info['widget types'];
   if ($widget_type) {
@@ -322,7 +311,7 @@ function _field_info_widget_types($widget_type = NULL) {
  *   Either a formatter type description, as provided by hook_field_formatter_info(),
  *   or an array of all existing widget types, keyed by widget type name.
  */
-function _field_info_formatter_types($formatter_type = NULL) {
+function field_info_formatter_types($formatter_type = NULL) {
   $info = _field_info_collate_types();
   $formatter_types = $info['formatter types'];
   if ($formatter_type) {
@@ -345,7 +334,7 @@ function _field_info_formatter_types($formatter_type = NULL) {
  *   Either a fieldable type description, as provided by hook_fieldable_info(),
  *   or an array of all existing fieldable types, keyed by fieldable type name.
  */
-function _field_info_fieldable_types($obj_type = NULL) {
+function field_info_fieldable_types($obj_type = NULL) {
   $info = _field_info_collate_types();
   $fieldable_types = $info['fieldable types'];
   if ($obj_type) {
@@ -362,7 +351,7 @@ function _field_info_fieldable_types($obj_type = NULL) {
  * Return an array of fieldable bundle names and labels, for an individual
  * object type or for all object types.
  */
-function _field_info_bundles($obj_type = NULL) {
+function field_info_bundles($obj_type = NULL) {
   $info = _field_info_collate_types();
   $bundles = array();
   foreach ($info['fieldable types'] as $type => $fieldable_info) {
@@ -378,7 +367,7 @@ function _field_info_bundles($obj_type = NULL) {
  * // TODO : might not be needed depending on how we solve
  * // the 'namespace bundle names' issue
  */
-function _field_info_bundle_entity($bundle) {
+function field_info_bundle_entity($bundle) {
   $info = _field_info_collate_types();
   foreach ($info['fieldable types'] as $type => $fieldable_info) {
     if (isset($fieldable_info['bundles'][$bundle])) {
@@ -396,7 +385,7 @@ function _field_info_bundle_entity($bundle) {
  *   property, bundles, which is an array of all the bundles to which
  *   this field belongs.
  */
-function _field_info_fields() {
+function field_info_fields() {
   $info = _field_info_collate_fields();
   return $info['fields'];
 }
@@ -411,7 +400,7 @@ function _field_info_fields() {
  *   property, bundles, which is an array of all the bundles to which
  *   this field belongs.
  */
-function _field_info_field($field_name) {
+function field_info_field($field_name) {
   $info = _field_info_collate_fields();
   if (isset($info['fields'][$field_name])) {
     return $info['fields'][$field_name];
@@ -425,7 +414,7 @@ function _field_info_field($field_name) {
  * @param $bundle_name
  *   If set, return information on just this bundle.
  */
-function _field_info_instances($bundle_name = NULL) {
+function field_info_instances($bundle_name = NULL) {
   $info = _field_info_collate_fields();
   if (!isset($bundle_name)) {
     return $info['instances'];
@@ -439,7 +428,7 @@ function _field_info_instances($bundle_name = NULL) {
 /**
  * Return an array of instance data for a specific field and bundle.
  */
-function _field_info_instance($field_name, $bundle_name) {
+function field_info_instance($field_name, $bundle_name) {
   $info = _field_info_collate_fields();
   if (isset($info['instances'][$bundle_name][$field_name])) {
     return $info['instances'][$bundle_name][$field_name];
@@ -455,7 +444,7 @@ function _field_info_instance($field_name, $bundle_name) {
  *   The field type's default settings, as provided by hook_field_info(), or an
  *   empty array.
  */
-function _field_info_field_settings($type) {
+function field_info_field_settings($type) {
   $info = field_info_field_types($type);
   return isset($info['settings']) ? $info['settings'] : array();
 }
@@ -469,7 +458,7 @@ function _field_info_field_settings($type) {
  *   The field type's default instance settings, as provided by
  *   hook_field_info(), or an empty array.
  */
-function _field_info_instance_settings($type) {
+function field_info_instance_settings($type) {
   $info = field_info_field_types($type);
   return isset($info['instance_settings']) ? $info['instance_settings'] : array();
 }
@@ -483,7 +472,7 @@ function _field_info_instance_settings($type) {
  *   The field type's default settings, as provided by hook_field_info(), or an
  *   empty array.
  */
-function _field_info_widget_settings($type) {
+function field_info_widget_settings($type) {
   $info = field_info_widget_types($type);
   return isset($info['settings']) ? $info['settings'] : array();
 }
@@ -497,11 +486,11 @@ function _field_info_widget_settings($type) {
  *   The field formatter's default settings, as provided by
  *   hook_field_info(), or an empty array.
  */
-function _field_info_formatter_settings($type) {
+function field_info_formatter_settings($type) {
   $info = field_info_formatter_types($type);
   return isset($info['settings']) ? $info['settings'] : array();
 }
 
 /**
- * @autoload} End of "@autoload field_info"
+ * @} End of "defgroup field_info"
  */