Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.10
diff -u -p -r1.10 field.module
--- modules/field/field.module	27 May 2009 18:33:56 -0000	1.10
+++ modules/field/field.module	1 Jun 2009 01:31:15 -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) {
 
 /**
  * Implement 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');
 }