Index: modules/field/modules/options/options.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/options/options.module,v
retrieving revision 1.25
diff -u -p -r1.25 options.module
--- modules/field/modules/options/options.module	11 Feb 2010 15:42:14 -0000	1.25
+++ modules/field/modules/options/options.module	2 Mar 2010 17:21:07 -0000
@@ -193,7 +193,13 @@ function _options_properties($type, $mul
  */
 function _options_get_options($field, $instance, $properties) {
   // Get the list of options.
-  $options = (array) module_invoke($field['module'], 'options_list', $field);
+  if (isset($field['settings']['options_list_callback'])) {
+    $function = $field['settings']['options_list_callback'];
+    $options = function($field);
+  }
+  else {
+    $options = (array) module_invoke($field['module'], 'options_list', $field);
+  }
 
   // Sanitize the options.
   _options_prepare_options($options, $properties);