? BODY-AS-FIELD.patch
? Makefile
? constants.pl
? d6-50-nodes.sql.gz
? d7-50-nodes.sql.gz
? head.kpf
? patches
? modules/field/field.delete.inc
? modules/field/modules/combo
? scripts/generate-autoload.pl
? sites/all/modules/cck
? sites/all/modules/devel
? sites/all/modules/pbs
? sites/all/modules/taint
? sites/default/files
? sites/default/settings.php
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.7
diff -u -F^[fc] -r1.7 field.module
--- modules/field/field.module	26 Mar 2009 13:31:24 -0000	1.7
+++ modules/field/field.module	5 May 2009 02:35:30 -0000
@@ -5,6 +5,14 @@
  * Attach custom data fields to Drupal objects.
  */
 
+/*
+ * 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.
+ */
+require(DRUPAL_ROOT . '/modules/field/field.crud.inc');
+require(DRUPAL_ROOT . '/modules/field/field.autoload.inc');
+
 /**
  * @defgroup field Field API
  * @{
@@ -108,14 +116,8 @@ function field_help($path, $arg) {
 
 /**
  * Implementation of hook_init().
- *
- * TODO D7: Determine which functions need to always be "loaded", and
- * put autoloaders for them into field.autoload.inc. Also figure out
- * how to make this work during installation.
  */
 function field_init() {
-  module_load_include('inc', 'field', 'field.crud');
-  module_load_include('inc', 'field', 'field.autoload');
   drupal_add_css(drupal_get_path('module', 'field') . '/theme/field.css');
 }