? .settings
Index: modules/field/field.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.api.php,v
retrieving revision 1.68
diff -u -p -r1.68 field.api.php
--- modules/field/field.api.php	26 Mar 2010 17:14:45 -0000	1.68
+++ modules/field/field.api.php	26 Mar 2010 23:33:08 -0000
@@ -1229,18 +1229,22 @@ function hook_field_storage_details_alte
  * @param $entities
  *   The array of entities for which to load data, keyed by entity id.
  * @param $age
- *   FIELD_LOAD_CURRENT to load the most recent revision for all
- *   fields, or FIELD_LOAD_REVISION to load the version indicated by
- *   each entity.
+ *   FIELD_LOAD_CURRENT to load the most recent revision for all fields, or
+ *   FIELD_LOAD_REVISION to load the version indicated by each entity.
  * @param $fields
  *   An array listing the fields to be loaded. The keys of the array are field
  *   ids, the values of the array are the entity ids (or revision ids,
  *   depending on the $age parameter) to be loaded for each field.
+ * @param $options
+ *   An associative array of additional options, with the following keys:
+ *   - 'deleted': If TRUE, deleted field should be returned as well as
+ *     non-deleted fields. If unset or FALSE, only non-deleted fields should be
+ *     returned.
  * @return
- *   Loaded field values are added to $entities. Fields with no values should be
- *   set as an empty array.
+ *   Loaded field values are added to $entities. Fields with no values should
+ *   be set as an empty array.
  */
-function hook_field_storage_load($entity_type, $entities, $age, $fields) {
+function hook_field_storage_load($entity_type, $entities, $age, $fields, $options) {
 }
 
 /**
@@ -1359,12 +1363,19 @@ function hook_field_storage_delete_insta
  *   An array keyed by field ids whose data has already been loaded and
  *   therefore should not be loaded again. The values associated to these keys
  *   are not specified.
+ * @param $options
+ *   An associative array of additional options, with the following keys:
+ *   - 'field_id': The field id that should be loaded. If unset, all fields
+ *     should be loaded.
+ *   - 'deleted': If TRUE, deleted field should be returned as well as
+ *     non-deleted fields. If unset or FALSE, only non-deleted fields should be
+ *     returned.
  * @return
  *   - Loaded field values are added to $entities. Fields with no values should
  *     be set as an empty array.
  *   - Loaded field ids are set as keys in $skip_fields.
  */
-function hook_field_storage_pre_load($entity_type, $entities, $age, &$skip_fields) {
+function hook_field_storage_pre_load($entity_type, $entities, $age, &$skip_fields, $options) {
 }
 
 /**
Index: modules/field/field.attach.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.attach.inc,v
retrieving revision 1.80
diff -u -p -r1.80 field.attach.inc
--- modules/field/field.attach.inc	26 Mar 2010 17:14:45 -0000	1.80
+++ modules/field/field.attach.inc	26 Mar 2010 23:28:30 -0000
@@ -540,13 +540,13 @@ function field_attach_form($entity_type,
  *   field_attach_load_revision() instead of passing FIELD_LOAD_REVISION.
  * @param $options
  *   An associative array of additional options, with the following keys:
- *  - 'field_id': The field id that should be loaded, instead of
- *    loading all fields, for each entity. Note that returned entities
- *    may contain data for other fields, for example if they are read
- *    from a cache.
- *  - 'deleted': If TRUE, the function will operate on deleted fields
- *    as well as non-deleted fields. If unset or FALSE, only
- *    non-deleted fields are operated on.
+ *   - 'field_id': The field id that should be loaded, instead of
+ *     loading all fields, for each entity. Note that returned entities
+ *     may contain data for other fields, for example if they are read
+ *     from a cache.
+ *   - 'deleted': If TRUE, the function will operate on deleted fields
+ *     as well as non-deleted fields. If unset or FALSE, only
+ *     non-deleted fields are operated on.
  * @return
  *   Loaded field values are added to $entities.
  */