### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.5
diff -u -r1.5 field_test.module
--- modules/simpletest/tests/field_test.module	1 May 2009 19:17:46 -0000	1.5
+++ modules/simpletest/tests/field_test.module	1 May 2009 23:10:02 -0000
@@ -165,13 +165,13 @@
 function field_test_entity_save(&$entity) {
   field_attach_presave('test_entity', $entity);
 
-  $entity->is_new = FALSE;
-  if (empty($entity->ftid)) {
-    // Insert a new test_entity.
-    $entity->is_new = TRUE;
+  if (!isset($entity->is_new)) {
+    $entity->is_new = empty($entity->ftid);
   }
-  elseif (!empty($entity->revision)) {
+
+  if (!$entity->is_new && !empty($entity->revision)) {
     $entity->old_ftvid = $entity->ftvid;
+    unset($entity->ftvid);
   }
 
   $update_entity = TRUE;