Index: content.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck/content.module,v
retrieving revision 1.34
diff -u -r1.34 content.module
--- content.module	29 Mar 2006 13:59:37 -0000	1.34
+++ content.module	29 Mar 2006 15:52:48 -0000
@@ -328,7 +328,7 @@
 
       if ($field['multiple']) {
         foreach ($node_field as $delta => $item) {
-          $data = array($node->vid, $delta, $node->nid);
+          $data = array();
           $column_names = array();
           $column_placeholders = array();
           foreach ($columns as $column => $attributes) {
@@ -341,11 +341,12 @@
             }
             $data[] = $item[$column];
           }
-          db_query('INSERT INTO {'. $table_name .'} (vid, delta, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, %d, '. implode(', ', $column_placeholders) .')', $data);
+          if (!implode('', $data)) continue;
+          db_query('INSERT INTO {'. $table_name .'} (vid, delta, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, %d, '. implode(', ', $column_placeholders) .')', array_merge(array($node->vid, $delta, $node->nid), $data));
         }
       }
       else {
-        $data = array($node->vid, $node->nid);
+        $data = array();
         $column_names = array();
         $column_placeholders = array();
         foreach ($columns as $column => $attributes) {
@@ -358,7 +359,8 @@
           }
           $data[] = $node_field[$column];
         }
-        db_query('INSERT INTO {'. $table_name .'} (vid, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, '. implode(', ', $column_placeholders) .')', $data);
+        if (!implode('', $data)) return;
+        db_query('INSERT INTO {'. $table_name .'} (vid, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, '. implode(', ', $column_placeholders) .')', array_merge(array($node->vid, $node->nid), $data));
       }
       return;
 
@@ -370,7 +372,7 @@
 
       if ($field['multiple']) {
         foreach ($node_field as $delta => $item) {
-          $data = array($node->vid, $delta, $node->nid);
+          $data = array();
           $column_names = array();
           $column_placeholders = array();
           foreach ($columns as $column => $attributes) {
@@ -383,11 +385,12 @@
             }
             $data[] = $item[$column];
           }
-          db_query('INSERT INTO {'. $table_name .'} (vid, delta, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, %d, '. implode(', ', $column_placeholders) .')', $data);
+          if (!implode('', $data)) continue;
+          db_query('INSERT INTO {'. $table_name .'} (vid, delta, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, %d, '. implode(', ', $column_placeholders) .')', array_merge(array($node->vid, $delta, $node->nid), $data));
         }
       }
       else {
-        $data = array($node->vid, $node->nid);
+        $data = array();
         $column_names = array();
         $column_placeholders = array();
         foreach ($columns as $column => $attributes) {
@@ -400,7 +403,8 @@
           }
           $data[] = $node_field[$column];
         }
-        db_query('INSERT INTO {'. $table_name .'} (vid, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, '. implode(', ', $column_placeholders) .')', $data);
+        if (!implode('', $data)) return;
+        db_query('INSERT INTO {'. $table_name .'} (vid, nid, '. implode(', ', $column_names) .') VALUES (%d, %d, '. implode(', ', $column_placeholders) .')', array_merge(array($node->vid, $node->nid), $data));
       }
 
       return;