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

1 files changed, 7 insertions, 6 deletions

diff --git a/modules/field/field.module b/modules/field/field.module
index b35d76b13..29bf758fa 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -6,12 +6,13 @@
  */
 
 /*
- * Load all Field API functions, either directly or via an
- * autoloader.  We can't do this during hook_init() because it isn't
- * run during update.php.
+ * Load all public Field API functions. Drupal currently has no
+ * mechanism for auto-loading core APIs, so we have to load them on
+ * every page request.
  */
 require(DRUPAL_ROOT . '/modules/field/field.crud.inc');
-require(DRUPAL_ROOT . '/modules/field/field.autoload.inc');
+require(DRUPAL_ROOT . '/modules/field/field.info.inc');
+require(DRUPAL_ROOT . '/modules/field/field.attach.inc');
 
 /**
  * @defgroup field Field API
@@ -108,8 +109,8 @@ function field_flush_caches() {
 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>';
+      $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;
   }
 }