Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/Attic/content.module,v
retrieving revision 1.301.2.123
diff -u -p -r1.301.2.123 content.module
--- content.module	3 Jan 2011 11:03:47 -0000	1.301.2.123
+++ content.module	18 Jan 2011 05:09:55 -0000
@@ -266,8 +266,8 @@ function content_load(&$node) {
  *
  */
 function content_validate(&$node, $form = NULL) {
-  _content_field_invoke('validate', $node, $form);
   _content_field_invoke_default('validate', $node, $form);
+  _content_field_invoke('validate', $node, $form);
 }
 
 /**
@@ -496,8 +496,11 @@ function theme_content_multiple_values($
         'data' => t('!title: !required', array('!title' => $element['#title'], '!required' => $required)),
         'colspan' => 2
       ),
-      t('Order'),
+      array('data' => t('Order'), 'class' => 'content-multiple-weight-header'),
     );
+    if ($field['multiple'] == 1) {
+      $header[] = array('data' => '<span>'. t('Remove') .'</span>', 'class' => 'content-multiple-remove-header');
+    }
     $rows = array();
 
     // Sort items according to '_weight' (needed when the form comes back after
@@ -505,24 +508,31 @@ function theme_content_multiple_values($
     $items = array();
     foreach (element_children($element) as $key) {
       if ($key !== $element['#field_name'] .'_add_more') {
-        $items[] = &$element[$key];
+        $items[$element[$key]['#delta']] = &$element[$key];
       }
     }
-    usort($items, '_content_sort_items_value_helper');
+    uasort($items, '_content_sort_items_value_helper');
 
     // Add the items as table rows.
-    foreach ($items as $key => $item) {
+    foreach ($items as $delta => $item) {
       $item['_weight']['#attributes']['class'] = $order_class;
       $delta_element = drupal_render($item['_weight']);
+      if ($field['multiple'] == 1) {
+        $remove_element = drupal_render($item['_remove']);
+      }
       $cells = array(
         array('data' => '', 'class' => 'content-multiple-drag'),
         drupal_render($item),
         array('data' => $delta_element, 'class' => 'delta-order'),
       );
-      $rows[] = array(
-        'data' => $cells,
-        'class' => 'draggable',
-      );
+      $row_class = 'draggable';
+      if ($field['multiple'] == 1) {
+        if (!empty($item['_remove']['#default_value'])) {
+          $row_class .= ' content-multiple-removed-row';
+        }
+        $cells[] = array('data' => $remove_element, 'class' => 'content-multiple-remove-cell');
+      }
+      $rows[] = array('data' => $cells, 'class' => $row_class);
     }
 
     $output .= theme('table', $header, $rows, array('id' => $table_id, 'class' => 'content-multiple-table'));
@@ -530,6 +540,7 @@ function theme_content_multiple_values($
     $output .= drupal_render($element[$element['#field_name'] .'_add_more']);
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
+    drupal_add_js(drupal_get_path('module', 'content') .'/theme/content-edit.js');
   }
   else {
     foreach (element_children($element) as $key) {
@@ -686,12 +697,8 @@ function content_associate_fields($modul
 function content_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
     case 'validate':
-      // TODO: here we could validate that the number of multiple data is correct ?
-      // We're controlling the number of fields to fill out and saving empty
-      // ones if a specified number is requested, so no reason to do any validation
-      // here right now, but if later create a method to indicate whether
-      // 'required' means all values must be filled out, we can come back
-      // here and check that they're not empty.
+      // Filter out empty values and items flagged for removal.
+      $items = content_set_empty($field, $items);
       break;
 
     case 'presave':
@@ -722,7 +729,7 @@ function content_field($op, &$node, $fie
         $items = _content_sort_items($field, $items);
       }
 
-      // Filter out empty values.
+      // Filter out empty values and items flagged for removal.
       $items = content_set_empty($field, $items);
 
       break;
@@ -730,8 +737,8 @@ function content_field($op, &$node, $fie
     case 'view':
       $addition = array();
 
-      // Previewed nodes bypass the 'presave' op, so we need to some massaging.
-      if ($node->build_mode == NODE_BUILD_PREVIEW && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+      // Previewed nodes bypass the 'presave' op, so we need to do some massaging.
+      if ($node->build_mode == NODE_BUILD_PREVIEW) {
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
           // Reorder items to account for drag-n-drop reordering.
           $items = _content_sort_items($field, $items);
@@ -776,10 +783,10 @@ function content_field($op, &$node, $fie
         );
 
         // Fill-in items.
-        foreach ($items as $delta => $item) {
+        foreach (array_keys($items) as $weight => $delta) {
           $element['items'][$delta] = array(
-            '#item' => $item,
-            '#weight' => $delta,
+            '#item' => $items[$delta],
+            '#weight' => $weight,
           );
         }
 
@@ -888,7 +895,7 @@ function content_field($op, &$node, $fie
 }
 
 /**
- * Helper function to filter out empty values.
+ * Helper function to filter out empty values and items flagged for removal.
  *
  * On order to keep marker rows in the database, the function ensures
  * that the right number of 'all columns NULL' values is kept.
@@ -899,20 +906,22 @@ function content_field($op, &$node, $fie
  *   returns filtered and adjusted item array
  */
 function content_set_empty($field, $items) {
-  // Filter out empty values.
+  // Prepare an empty item.
+  $empty = array();
+  foreach (array_keys($field['columns']) as $column) {
+    $empty[$column] = NULL;
+  }
+
+  // Filter out items flagged for removal.
   $filtered = array();
   $function = $field['module'] .'_content_is_empty';
   foreach ((array) $items as $delta => $item) {
-    if (!$function($item, $field)) {
-      $filtered[] = $item;
+    if (empty($item['_remove'])) {
+      $filtered[] = ($function($item, $field) ? $empty : $item);
     }
   }
 
   // Make sure we store the right number of 'empty' values.
-  $empty = array();
-  foreach (array_keys($field['columns']) as $column) {
-    $empty[$column] = NULL;
-  }
   $pad = $field['multiple'] > 1 ? $field['multiple'] : 1;
   $filtered = array_pad($filtered, $pad, $empty);
 
@@ -927,7 +936,7 @@ function _content_sort_items($field, $it
   if ($field['multiple'] >= 1 && isset($items[0]['_weight'])) {
     usort($items, '_content_sort_items_helper');
     foreach ($items as $delta => $item) {
-      if (is_array($items[$delta])) {
+      if (is_array($item) && isset($item['_weight'])) {
         unset($items[$delta]['_weight']);
       }
     }
@@ -1008,7 +1017,14 @@ function content_storage($op, $node) {
             if (!isset($additions[$field_name])) {
               $additions[$field_name] = array();
             }
-            $additions[$field_name][] = $item;
+
+            // Preserve deltas when loading items from database.
+            if (isset($row['delta'])) {
+              $additions[$field_name][$row['delta']] = $item;
+            }
+            else {
+              $additions[$field_name][] = $item;
+            }
           }
         }
       }
Index: includes/content.node_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/Attic/content.node_form.inc,v
retrieving revision 1.7.2.24
diff -u -p -r1.7.2.24 content.node_form.inc
--- includes/content.node_form.inc	30 Dec 2010 13:55:30 -0000	1.7.2.24
+++ includes/content.node_form.inc	18 Jan 2011 05:09:55 -0000
@@ -152,21 +152,23 @@ function content_multiple_value_form(&$f
 
   switch ($field['multiple']) {
     case 0:
+      $deltas = array(0);
       $max = 0;
       break;
-    case 1:
-      $filled_items = content_set_empty($field, $items);
-      $current_item_count = isset($form_state['item_count'][$field_name])
-                            ? $form_state['item_count'][$field_name]
-                            : count($items);
-      // We always want at least one empty icon for the user to fill in.
-      $max = ($current_item_count > count($filled_items))
-              ? $current_item_count - 1
-              : $current_item_count;
 
+    case 1:
+      $deltas = array_keys($items);
+      $current_item_count = isset($form_state['item_count'][$field_name]) ? $form_state['item_count'][$field_name] : max(1, count($deltas));
+      $max = (!empty($deltas) ? max($deltas) : -1);
+      while (count($deltas) < $current_item_count) {
+        $max++;
+        $deltas[] = $max;
+      }
       break;
+
     default:
       $max = $field['multiple'] - 1;
+      $deltas = range(0, $max);
       break;
   }
 
@@ -181,7 +183,7 @@ function content_multiple_value_form(&$f
   );
   $function = $field['widget']['module'] .'_widget';
 
-  for ($delta = 0; $delta <= $max; $delta++) {
+  foreach ($deltas as $delta) {
     if ($element = $function($form, $form_state, $field, $items, $delta)) {
       $defaults = array(
         '#title' => ($field['multiple'] >= 1) ? '' : $title,
@@ -207,6 +209,18 @@ function content_multiple_value_form(&$f
         );
       }
 
+      // Add a checkbox to allow users remove a single delta item.
+      // See content_set_empty() and theme_content_multiple_values().
+      if ($field['multiple'] == 1) {
+        // We name the element '_remove' to avoid clashing with column names
+        // defined by field modules.
+        $element['_remove'] = array(
+          '#type' => 'checkbox',
+          '#attributes' => array('class' => 'content-multiple-remove-checkbox'),
+          '#default_value' => isset($items[$delta]['_remove']) ? $items[$delta]['_remove'] : 0,
+        );
+      }
+
       $form_element[$delta] = array_merge($element, $defaults);
     }
   }
@@ -313,11 +327,13 @@ function content_add_more_js($type_name_
   unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
   foreach ($_POST[$field_name] as $delta => $item) {
     $form_state['values'][$field_name][$delta]['_weight'] = $item['_weight'];
+    $form_state['values'][$field_name][$delta]['_remove'] = isset($item['_remove']) ? $item['_remove'] : 0;
   }
   $form_state['values'][$field_name] = _content_sort_items($field, $form_state['values'][$field_name]);
   $_POST[$field_name] = _content_sort_items($field, $_POST[$field_name]);
 
   // Build our new form element for the whole field, asking for one more element.
+  $delta = max(array_keys($_POST[$field_name])) + 1;
   $form_state['item_count'] = array($field_name => count($_POST[$field_name]) + 1);
   $form_element = content_field_form($form, $form_state, $field);
   // Let other modules alter it.
@@ -344,7 +360,6 @@ function content_add_more_js($type_name_
 
   // Build the new form against the incoming $_POST values so that we can
   // render the new element.
-  $delta = max(array_keys($_POST[$field_name])) + 1;
   $_POST[$field_name][$delta]['_weight'] = $delta;
   $form_state = array('submitted' => FALSE);
   $form += array(
Index: includes/views/handlers/content_plugin_style_php_array_ac.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/views/handlers/Attic/content_plugin_style_php_array_ac.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 content_plugin_style_php_array_ac.inc
--- includes/views/handlers/content_plugin_style_php_array_ac.inc	4 Nov 2009 15:31:28 -0000	1.1.2.3
+++ includes/views/handlers/content_plugin_style_php_array_ac.inc	18 Jan 2011 05:09:56 -0000
@@ -13,6 +13,11 @@ class content_plugin_style_php_array_ac 
     $sets = $this->render_grouping($this->view->result, $this->options['grouping']);
 
     $base_field = $this->view->base_field;
+    $base_field_alias = $this->view->field[$base_field]->field_alias;
+    if( isset($base_field_alias) ){
+      $base_field = $base_field_alias;
+    }
+
     $title_field = $this->display->display_options['content_title_field'];
     $title_field_alias = $this->view->field[$title_field]->field_alias;
 
@@ -21,14 +26,16 @@ class content_plugin_style_php_array_ac 
     $this->view->row_index = 0;
     foreach ($sets as $title => $records) {
       foreach ($records as $label => $row) {
-        $results[$row->{$base_field}] = array(
-          'title' => $row->{$title_field_alias},
-          'rendered' => $this->row_plugin->render($row),
-        );
-        $this->view->row_index++;
+        if( !is_null($row->{$base_field}) ) {
+          $results[$row->{$base_field}] = array(
+            'title' => $row->{$title_field_alias},
+            'rendered' => $this->row_plugin->render($row),
+          );
+          $this->view->row_index++;
+        }
       }
-    }
-    unset($this->view->row_index);
-    return $results;
   }
+  unset($this->view->row_index);
+  return $results;
+}
 }
Index: tests/content.crud.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/tests/Attic/content.crud.test,v
retrieving revision 1.4.2.16
diff -u -p -r1.4.2.16 content.crud.test
--- tests/content.crud.test	8 Dec 2008 12:41:08 -0000	1.4.2.16
+++ tests/content.crud.test	18 Jan 2011 05:09:56 -0000
@@ -1234,3 +1234,70 @@ class ContentOptionWidgetTest extends Co
 
 }
 
+class ContentEmptyDeltaTest extends ContentCrudTestCase {
+  function getInfo() {
+    return array(
+      'name' => t('Empty deltas'),
+      'description' => t('Test leaving empty values on a multivalue field and then removing them.'),
+      'group' => t('CCK'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp();
+    $this->loginWithPermissions();
+    $this->acquireContentTypes(1);
+  }
+
+  function testEmptyTextField() {
+    // Create a content type with a multivalue text field.
+    $type = $this->content_types[0];
+    $type_url = str_replace('_', '-', $type->type);
+    $value1 = $this->randomName(5);
+    $value2 = $this->randomName(5);
+    $value3 = $this->randomName(5);
+    $field = $this->createFieldText(array('text_processing' => 0, 'multiple' => 1));
+    $field_name = $field['field_name'];
+
+    // Create a node with three values set.
+    $edit = array(
+      'title' => $this->randomName(20),
+      'body' => $this->randomName(20),
+      'type' => $type->name,
+    );
+    $edit[$field_name][0]['value'] = $value1;
+    $edit[$field_name][1]['value'] = $value2;
+    $edit[$field_name][2]['value'] = $value3;
+    $node = $this->drupalCreateNode($edit);
+    $max_delta = max(array_keys($node->{$field_name}));
+    $this->assertEqual($max_delta, 2, 'Three values saved, highest delta is 2');
+    $this->drupalGet('node/'. $node->nid);
+    $this->assertText($value1, 'First value displayed');
+    $this->assertText($value2, 'Second value displayed');
+    $this->assertText($value3, 'Third value displayed');
+
+    // Set second value to an empty string.
+    $node->{$field_name}[1]['value'] = '';
+    node_save($node);
+    $node = node_load($node->nid, NULL, TRUE);
+    $this->assertIdentical($node->{$field_name}[1]['value'], NULL, 'Second value is empty');
+    $max_delta = max(array_keys($node->{$field_name}));
+    $this->assertEqual($max_delta, 2, 'Three values saved, highest delta is 2');
+    $this->drupalGet('node/'. $node->nid);
+    $this->assertText($value1, 'First value displayed');
+    $this->assertNoText($value2, 'Second value not displayed');
+    $this->assertText($value3, 'Third value displayed');
+
+    // Remove the second value.
+    $node->{$field_name}[1]['_remove'] = 1;
+    node_save($node);
+    $node = node_load($node->nid, NULL, TRUE);
+    $this->assertEqual($node->{$field_name}[1]['value'], $value3, 'Third value has moved to delta 1');
+    $max_delta = max(array_keys($node->{$field_name}));
+    $this->assertEqual($max_delta, 1, 'Two values saved, highest delta is 1');
+    $this->drupalGet('node/'. $node->nid);
+    $this->assertText($value1, 'First value displayed');
+    $this->assertNoText($value2, 'Second value not displayed');
+    $this->assertText($value3, 'Third value displayed');
+  }
+}
Index: theme/content-module.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/theme/Attic/content-module.css,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 content-module.css
--- theme/content-module.css	14 Mar 2009 18:45:38 -0000	1.1.2.6
+++ theme/content-module.css	18 Jan 2011 05:09:56 -0000
@@ -27,6 +27,42 @@
   margin:0;
 }
 
+.content-multiple-remove-button {
+  display: block;
+  float: right;
+  height: 14px;
+  width: 16px;
+  margin: 2px 0 1px 0;
+  padding: 0;
+  background:transparent url(../images/remove.png) no-repeat 0 0;
+  border-bottom: #C2C9CE 1px solid;
+  border-right: #C2C9CE 1px solid;
+}
+.content-multiple-remove-button:hover {
+  background-position: 0 -14px;
+}
+.content-multiple-removed-row .content-multiple-remove-button {
+  background-position: 0 -28px;
+}
+.content-multiple-removed-row .content-multiple-remove-button:hover {
+  background-position: 0 -42px;
+}
+html.js .content-multiple-removed-row {
+  background-color: #ffffcc;
+}
+.content-multiple-weight-header,
+.content-multiple-remove-header,
+.content-multiple-remove-cell,
+.content-multiple-table td.delta-order {
+  text-align: center;
+}
+html.js .content-multiple-weight-header,
+html.js .content-multiple-remove-header span,
+html.js .content-multiple-table td.delta-order,
+html.js .content-multiple-remove-checkbox {
+  display: none;
+}
+
 .node-form .number {
   display:inline;
   width:auto;