Index: colorpicker_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/colorpicker/colorpicker_cck.module,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 colorpicker_cck.module
--- colorpicker_cck.module	13 Mar 2009 20:16:52 -0000	1.4.2.3
+++ colorpicker_cck.module	18 Jan 2010 03:41:27 -0000
@@ -53,8 +53,10 @@
         foreach ($items as $delta => $item) {
           $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
 
-          if ($item['value'] !== '#' && !preg_match('/^#(?:(?:[a-f\d]{3}){1,2})$/i', $item['value'])) {
-            form_set_error($error_element, "'". check_plain($item['value']) ."'". t(' is not a valid hex color'));
+          if ($field['required'] || !empty($item['value'])) {
+            if ($item['value'] !== '#' && !preg_match('/^#(?:(?:[a-f\d]{3}){1,2})$/i', $item['value'])) {
+              form_set_error($error_element, "'". check_plain($item['value']) ."'". t(' is not a valid hex color'));
+            }
           }
         }
       }
@@ -150,7 +152,7 @@
 function colorpicker_cck_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   $element = array(
     '#type' => $field['widget']['type'],
-    '#default_value' => isset($items[$delta]) ? $items[$delta] : '#FF0000',
+    '#default_value' => isset($items[$delta]) ? $items[$delta] : '',
   );
   return $element;
 }
@@ -168,7 +170,7 @@
   $field = $form['#field_info'][$field_name];
   $field_key  = $element['#columns'][0];
 
-  $value = isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : '#FF0000';
+  $value = isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : '';
 
   $element[$field_key] = array(
     '#type' => 'colorpicker_textfield',