### Eclipse Workspace Patch 1.0
#P Drupal-7-HEAD
Index: modules/field/modules/options/options.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/options/options.module,v
retrieving revision 1.26
diff -u -r1.26 options.module
--- modules/field/modules/options/options.module	13 Apr 2010 15:23:02 -0000	1.26
+++ modules/field/modules/options/options.module	8 Jul 2010 12:21:25 -0000
@@ -137,6 +137,10 @@
  * Form element validation handler for options element.
  */
 function options_field_widget_validate($element, &$form_state) {
+  if ($element['#required'] && $element['#value'] == '_none') {
+    form_error($element, t('!name field is required.', array('!name' => $element['#title'])));
+  }
+
   // Transpose selections from field => delta to delta => field, turning
   // multiple selected options into multiple parent elements.
   $items = _options_form_to_storage($element);
@@ -162,7 +166,7 @@
       $properties = array(
         // Select boxes do not support any HTML tag.
         'strip_tags' => TRUE,
-        'empty_value' => !$required,
+        'empty_value' => !($required && !$multiple),
         'optgroups' => TRUE,
       );
       break;