? constants.pl
? head.kpf
? patches
? test.php
? scripts/generate-autoload.pl
? sites/all/cck
? sites/all/modules/devel
? sites/all/modules/pbs
? sites/all/modules/taint
? sites/default/files
? sites/default/settings.php
Index: modules/field/field.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.api.php,v
retrieving revision 1.1
diff -u -F^[fc] -r1.1 field.api.php
--- modules/field/field.api.php	7 Feb 2009 19:43:00 -0000	1.1
+++ modules/field/field.api.php	8 Feb 2009 23:00:13 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: field.api.php,v 1.1 2009/02/07 19:43:00 webchick Exp $
+// $Id: api.field.php,v 1.1 2009/02/03 17:30:11 dries Exp $
 
 /**
  * @ingroup field_fieldable_type
@@ -402,13 +402,35 @@ function hook_field_attach_form($obj_typ
 }
 
 /**
- * Act on field_attach_load.  This hook is invoked after the field module
- * has performed the operation.
+ * Act on field_attach_load.  This hook allows modules to load data
+ * before the Field Storage API, preventing the field storage module
+ * from doing so.
  *
- * See field_attach_load() for details and arguments.  TODO:
- * Currently, this hook only accepts a single object a time.
+ * @param $obj_type
+ *   The type of objects for which to load fields; e.g. 'node' or
+ *   'user'.
+ * @param $objects
+ *   An array of objects for which to load fields.  The keys for
+ *   primary id and bundle name to load are identified by
+ *   hook_fieldable_info for $obj_type.
+ * @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 object.
+ * @param $skip_fields
+ *   An array of whose keys are field names whose data has already
+ *   been loaded and therefore should not be loaded again.
+ * @return
+ *   An array with two keys:
+ *   - 'fields': An array of whose keys are the field names that were
+ *     loaded by this function and should not be loaded by subsequent
+ *     functions. 
+ *   - 'additions': An array whose keys are object ids for which data
+ *     was loaded, and whose values are arrays whose keys are field
+ *     names loaded for the object and whose values are the field data
+ *     items loaded for the object.n
  */
-function hook_field_attach_load($obj_type, $object) {
+function hook_field_attach_load($obj_type, $objects, $age, $skip_fields) {
 }
 
 /**
@@ -439,21 +461,41 @@ function hook_field_attach_presave($obj_
 }
 
 /**
- * Act on field_attach_insert.  This hook is invoked after the field module
- * has performed the operation.
+ * Act on field_attach_insert.  This hook allows modules to store data
+ * before the Field Storage API, preventing the field storage module
+ * from doing so.
  *
- * See field_attach_insert() for details and arguments.
+ * @param $obj_type
+ *   The type of $object; e.g. 'node' or 'user'.
+ * @param $object
+ *   The object with fields to save.
+ * @param $skip_fields
+ *   An array whose keys are field names whose data has already
+ *   been saved and therefore should not be saved again.
+ * @return
+ *   An array whose keys are field names that were saved by this
+ *   function and therefore should not be saved again.
  */
-function hook_field_attach_insert($obj_type, $object) {
+function hook_field_attach_insert($obj_type, $object, $skip_fields) {
 }
 
 /**
- * Act on field_attach_update.  This hook is invoked after the field module
- * has performed the operation.
+ * Act on field_attach_update.  This hook allows modules to store data
+ * before the Field Storage API, preventing the field storage module
+ * from doing so.
  *
- * See field_attach_update() for details and arguments.
+ * @param $obj_type
+ *   The type of $object; e.g. 'node' or 'user'.
+ * @param $object
+ *   The object with fields to save.
+ * @param $skip_fields
+ *   An array whose keys are field names whose data has already
+ *   been saved and therefore should not be saved again.
+ * @return
+ *   An array whose keys are field names that were saved by this
+ *   function and therefore should not be saved again.
  */
-function hook_field_attach_update($obj_type, $object) {
+function hook_field_attach_update($obj_type, $object, $skip_fields) {
 }
 
 /**
@@ -560,7 +602,7 @@ function hook_field_storage_load($obj_ty
  *   TRUE if this is an update to an existing object, FALSE if it is
  *   an insert of a new object.
  */
-function hook_field_storage_write($obj_type, $object, $update = TRUE) {
+function hook_field_storage_write($obj_type, $object, $update) {
 }
 
 /**
Index: modules/field/field.attach.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.attach.inc,v
retrieving revision 1.2
diff -u -F^[fc] -r1.2 field.attach.inc
--- modules/field/field.attach.inc	5 Feb 2009 03:42:57 -0000	1.2
+++ modules/field/field.attach.inc	8 Feb 2009 23:00:13 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: field.attach.inc,v 1.2 2009/02/05 03:42:57 webchick Exp $
+// $Id: field.attach.inc,v 1.1 2009/02/03 17:30:11 dries Exp $
 
 // TODO D7 : consistency - do field_attach_functions return a value or alter in place ?
 
@@ -201,7 +201,7 @@ function _field_attach_form($obj_type, $
 function _field_attach_load($obj_type, $objects, $age = FIELD_LOAD_CURRENT) {
   $queried_objects = array();
 
-  // Fetch avaliable nodes from cache.
+  // Fetch avaliable objects from cache.
   foreach ($objects as $object) {
     list($id, $vid, $bundle, $cacheable) = field_attach_extract_ids($obj_type, $object);
     $cid = "field:$obj_type:$id:$vid";
@@ -214,17 +214,41 @@ function _field_attach_load($obj_type, $
       $queried_objects[$id] = $objects[$id];
     }
   }
-  // Fetch other nodes from the database.
+
+  // Fetch other objects from the database.
   if ($queried_objects) {
     // We need the raw additions to be able to cache them, so
-    // content_storage_load() and hook_field_load() must not alter
-    // nodes directly but return their additions.
-    $additions = module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_load', $obj_type, $queried_objects, $age);
+    // hook_field_storage_load() and hook_field_attach_load() must not
+    // alter objects directly but return their additions.
+
+    // Let any module load field data before the storage engine,
+    // accumulating along the way.
+    $loaded = array('fields' => array(), 'additions' => array());
+    foreach (module_implements('field_attach_load') as $module) {
+      $function = $module . '_field_attach_load';
+      $return = $function($obj_type, $queried_objects, $age, $loaded['fields']);
+      // We can't use array_merge_recursive() here because it will not
+      // preserve the numeric object ids.
+      foreach ($return['additions'] as $id => $fields) {
+        $loaded['additions'][$id] = $fields;
+      }
+      $loaded['fields'] = array_merge($loaded['fields'], $return['fields']);
+    }
+
+    // The field storage engine loads the rest.
+    $additions = module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_load', $obj_type, $queried_objects, $age, $loaded['fields']);
+
     foreach ($additions as $id => $obj_additions) {
       foreach ($obj_additions as $key => $value) {
         $queried_objects[$id]->$key = $value;
       }
     }
+    foreach ($loaded['additions'] as $id => $obj_additions) {
+      foreach ($obj_additions as $key => $value) {
+        $queried_objects[$id]->$key = $value;
+        $additions[$id][$key] = $value;
+      }
+    }
 
     // TODO D7 : to be consistent we might want to make hook_field_load() accept
     // multiple objects too. Which forbids going through _field_invoke(), but
@@ -247,15 +271,6 @@ function _field_attach_load($obj_type, $
         $additions[$id][$key] = $value;
       }
 
-      // Let other modules act on loading the object.
-      // TODO : this currently doesn't get cached (we cache $additions).
-      // This should either be called after we fetch from cache, or return an
-      // array of additions.
-      foreach (module_implements('field_attach_load') as $module) {
-        $function = $module . '_field_attach_load';
-        $function($obj_type, $queried_objects[$id]);
-      }
-
       // Cache the data.
       if ($cacheable) {
         $cid = "field:$obj_type:$id:$vid";
@@ -374,14 +389,19 @@ function _field_attach_presave($obj_type
  */
 function _field_attach_insert($obj_type, &$object) {
 
-  // Let other modules act on inserting the object.
+  _field_invoke('insert', $obj_type, $object);
+
+  // Let other modules act on inserting the object, accumulating saved
+  // fields along the way.
+  $saved = array();
   foreach (module_implements('field_attach_insert') as $module) {
     $function = $module . '_field_attach_insert';
-    $function($obj_type, $object);
+    $return = $function($obj_type, $object, $saved);
+    $saved = array_merge($saved, $return);
   }
 
-  _field_invoke('insert', $obj_type, $object);
-  module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_write', $obj_type, $object);
+  // Field storage module saves any remaining unsaved fields.
+  module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_write', $obj_type, $object, FALSE, $saved);
 
   list($id, $vid, $bundle, $cacheable) = field_attach_extract_ids($obj_type, $object);
   if ($cacheable) {
@@ -399,14 +419,19 @@ function _field_attach_insert($obj_type,
  */
 function _field_attach_update($obj_type, &$object) {
 
-  // Let other modules act on updating the object.
+  _field_invoke('update', $obj_type, $object);
+
+  // Let other modules act on updating the object, accumulating saved
+  // fields along the way.
+  $saved = array();
   foreach (module_implements('field_attach_update') as $module) {
     $function = $module . '_field_attach_update';
-    $function($output, $obj_type, $object);
+    $return = $function($obj_type, $object, $saved);
+    $saved = array_merge($saved, $return);
   }
 
-  _field_invoke('update', $obj_type, $object);
-  module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_write', $obj_type, $object, TRUE);
+  // Field storage module saves any remaining unsaved fields.
+  module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_write', $obj_type, $object, TRUE, $saved);
 
   list($id, $vid, $bundle, $cacheable) = field_attach_extract_ids($obj_type, $object);
   if ($cacheable) {
Index: modules/field/field.autoload.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.autoload.inc,v
retrieving revision 1.2
diff -u -F^[fc] -r1.2 field.autoload.inc
--- modules/field/field.autoload.inc	8 Feb 2009 21:22:59 -0000	1.2
+++ modules/field/field.autoload.inc	8 Feb 2009 23:00:13 -0000
@@ -505,7 +505,9 @@ function field_info_bundle_entity($bundl
  * Return array of all field data, keyed by field name.
  *
  * @return
- *   An array of Field objects.
+ *   An array of Field objects.  Each Field object has an additional
+ *   property, bundles, which is an array of all the bundles to which
+ *   this field belongs.
  *
  * This function is an autoloader for _field_info_fields() in modules/field/field.info.inc.
  */
@@ -518,6 +520,11 @@ function field_info_fields() {
  * Return data about an individual field.
  *
  * @param $field_name
+ *   The name of the field to retrieve.
+ * @return
+ *   The named field object, or NULL.  The Field object has an additional
+ *   property, bundles, which is an array of all the bundles to which
+ *   this field belongs.
  *
  * This function is an autoloader for _field_info_field() in modules/field/field.info.inc.
  */
Index: modules/field/field.crud.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.crud.inc,v
retrieving revision 1.3
diff -u -F^[fc] -r1.3 field.crud.inc
--- modules/field/field.crud.inc	8 Feb 2009 21:22:59 -0000	1.3
+++ modules/field/field.crud.inc	8 Feb 2009 23:00:13 -0000
@@ -338,10 +338,11 @@ function field_create_instance($instance
 
   _field_write_instance($instance);
 
-  module_invoke_all('field_create_instance', $instance);
-
   // Clear caches
   field_cache_clear();
+
+  module_invoke_all('field_create_instance', $instance);
+
   return FALSE;
 }
 
Index: modules/field/modules/field_sql_storage/field_sql_storage.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/field_sql_storage/field_sql_storage.module,v
retrieving revision 1.3
diff -u -F^[fc] -r1.3 field_sql_storage.module
--- modules/field/modules/field_sql_storage/field_sql_storage.module	5 Feb 2009 03:42:57 -0000	1.3
+++ modules/field/modules/field_sql_storage/field_sql_storage.module	8 Feb 2009 23:00:13 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: field_sql_storage.module,v 1.3 2009/02/05 03:42:57 webchick Exp $
+// $Id: field_sql_storage.module,v 1.2 2009/02/04 20:27:58 webchick Exp $
 
 /**
  * @file
@@ -179,11 +179,14 @@ function field_sql_storage_field_storage
  *   FIELD_LOAD_CURRENT to load the most recent revision for all
  *   fields, or FIELD_LOAD_REVISION to load the version indicated by
  *   each object.
+ * @param $skip_fields
+ *   An array of field names for which data has already been loaded
+ *   and so should not be loaded by this function.
  * @return
  *   An array of field data for the objects, keyed by entity id, field
  *   name, and item delta number.
  */
-function field_sql_storage_field_storage_load($obj_type, $objects, $age) {
+function field_sql_storage_field_storage_load($obj_type, $objects, $age, $skip_fields = array()) {
   $etid = _field_sql_storage_etid($obj_type);
   $load_current = $age == FIELD_LOAD_CURRENT;
 
@@ -200,6 +203,10 @@ function field_sql_storage_field_storage
 
   $additions = array();
   foreach ($field_ids as $field_name => $ids) {
+    if (isset($skip_fields[$field_name])) {
+      continue;
+    }
+
     $field = field_info_field($field_name);
     $table = $load_current ? _field_sql_storage_tablename($field_name) : _field_sql_storage_revision_tablename($field_name);
 
@@ -229,13 +236,17 @@ function field_sql_storage_field_storage
   return $additions;
 }
 
-function field_sql_storage_field_storage_write($obj_type, $object, $update = FALSE) {
+function field_sql_storage_field_storage_write($obj_type, $object, $update = FALSE, $skip_fields = array()) {
   list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object);
   $etid = _field_sql_storage_etid($obj_type);
 
   $instances = field_info_instances($bundle);
   foreach ($instances as $instance) {
     $field_name = $instance['field_name'];
+    if (isset($skip_fields[$field_name])) {
+      continue;
+    }
+
     $table_name = _field_sql_storage_tablename($field_name);
     $revision_name = _field_sql_storage_revision_tablename($field_name);
     $field = field_read_field($field_name);
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.2
diff -u -F^[fc] -r1.2 field_test.module
--- modules/simpletest/tests/field_test.module	5 Feb 2009 03:42:58 -0000	1.2
+++ modules/simpletest/tests/field_test.module	8 Feb 2009 23:00:13 -0000
@@ -84,7 +84,7 @@ function field_test_fieldable_info() {
 }
 
 function field_test_create_bundle($bundle, $text) {
-  $bundles = variable_get('field_test_bundles', array('field_text_bundle' => 'Test Bundle'));
+  $bundles = variable_get('field_test_bundles', array('test_bundle' => 'Test Bundle'));
   $bundles += array($bundle => $text);
   variable_set('field_test_bundles', $bundles);
 
@@ -92,7 +92,7 @@ function field_test_create_bundle($bundl
 }
 
 function field_test_rename_bundle($bundle_old, $bundle_new) {
-  $bundles = variable_get('field_test_bundles', array('field_text_bundle' => 'Test Bundle'));
+  $bundles = variable_get('field_test_bundles', array('test_bundle' => 'Test Bundle'));
   $bundles[$bundle_new] = $bundles[$bundle_old];
   unset($bundles[$bundle_old]);
   variable_set('field_test_bundles', $bundles);
@@ -101,7 +101,7 @@ function field_test_rename_bundle($bundl
 }
 
 function field_test_delete_bundle($bundle) {
-  $bundles = variable_get('field_test_bundles', array('field_text_bundle' => 'Test Bundle'));
+  $bundles = variable_get('field_test_bundles', array('test_bundle' => 'Test Bundle'));
   unset($bundles[$bundle]);
   variable_set('field_test_bundles', $bundles);