From df906ba9de2391f32837ba98a8fb720c480b0b8a Mon Sep 17 00:00:00 2001 From: Tim Plunkett Date: Thu, 21 Apr 2011 13:30:17 -0400 Subject: [PATCH] Issue #1033850 by tim.plunkett: Cleaned up validation code. --- ctr_field.module | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ctr_field.module b/ctr_field.module index 4d5c5e0..38d3243 100644 --- a/ctr_field.module +++ b/ctr_field.module @@ -158,19 +158,10 @@ function ctr_field_field_widget_form(&$form, &$form_state, $field, $instance, $l function ctr_field_text_widget_validate($element, &$form_state) { $instance = field_widget_instance($element, $form_state); - $delta = $element['#delta']; // TODO: Isn't there a better way to find out which element? - $field = $form_state['field'][$element['#field_name']][$element['#language']]['field']; - $field_name = $field['field_name']; - - if (isset($form_state['values'][$field_name][$element['#language']][$delta])) { - $values = $form_state['values'][$field_name][$element['#language']][$delta]; - if (!empty($values['uid'])) { - $regexp = '@[^-0-9]@'; - $message = t('Please enter a valid user ID %field.', array('%field' => t($instance['label']))); - if ($values['uid'] != preg_replace($regexp, '', $values['uid'])) { - form_error($element, $message); - } - } + $value = $element['uid']['#value']; + if (!empty($value) && !is_numeric($value)) { + $message = t('Please enter a valid user ID %field.', array('%field' => t($instance['label']))); + form_error($element, $message); } } -- 1.7.3.2