diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2011-07-31 19:41:30 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-07-31 19:41:30 -0700 |
commit | fb55033fffa5626cd5d5bcf85d50791e0ad7ec2d (patch) | |
tree | b4a1fce4ad8f80c2d11d02f34d0174a8101486c3 | |
parent | 9c85b350d196823f6aeedcdde7d0a55355e60747 (diff) | |
download | brdo-fb55033fffa5626cd5d5bcf85d50791e0ad7ec2d.tar.gz brdo-fb55033fffa5626cd5d5bcf85d50791e0ad7ec2d.tar.bz2 |
Oopsie. Wrong patch.
-rw-r--r-- | includes/form.inc | 30 | ||||
-rw-r--r-- | modules/field/field.module | 30 | ||||
-rw-r--r-- | modules/field/modules/number/number.module | 4 | ||||
-rw-r--r-- | modules/field/modules/text/text.module | 8 | ||||
-rw-r--r-- | modules/field_ui/field_ui.api.php | 8 |
5 files changed, 40 insertions, 40 deletions
diff --git a/includes/form.inc b/includes/form.inc index df1b2f73b..99570a538 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -4004,36 +4004,6 @@ function _form_set_class(&$element, $class = array()) { } /** - * Helper form element validator: integer. - */ -function element_validate_integer($element, &$form_state) { - $value = $element['#value']; - if ($value !== '' && (!is_numeric($value) || intval($value) != $value)) { - form_error($element, t('%name must be an integer.', array('%name' => $element['#title']))); - } -} - -/** - * Helper form element validator: integer > 0. - */ -function element_validate_integer_positive($element, &$form_state) { - $value = $element['#value']; - if ($value !== '' && (!is_numeric($value) || intval($value) != $value || $value <= 0)) { - form_error($element, t('%name must be a positive integer.', array('%name' => $element['#title']))); - } -} - -/** - * Helper form element validator: number. - */ -function element_validate_number($element, &$form_state) { - $value = $element['#value']; - if ($value != '' && !is_numeric($value)) { - form_error($element, t('%name must be a number.', array('%name' => $element['#title']))); - } -} - -/** * @} End of "defgroup form_api". */ diff --git a/modules/field/field.module b/modules/field/field.module index 6432ce060..af9e8c835 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -1174,3 +1174,33 @@ function theme_field($variables) { return $output; } + +/** + * Helper form element validator: integer. + */ +function _element_validate_integer($element, &$form_state) { + $value = $element['#value']; + if ($value !== '' && (!is_numeric($value) || intval($value) != $value)) { + form_error($element, t('%name must be an integer.', array('%name' => $element['#title']))); + } +} + +/** + * Helper form element validator: integer > 0. + */ +function _element_validate_integer_positive($element, &$form_state) { + $value = $element['#value']; + if ($value !== '' && (!is_numeric($value) || intval($value) != $value || $value <= 0)) { + form_error($element, t('%name must be a positive integer.', array('%name' => $element['#title']))); + } +} + +/** + * Helper form element validator: number. + */ +function _element_validate_number($element, &$form_state) { + $value = $element['#value']; + if ($value != '' && !is_numeric($value)) { + form_error($element, t('%name must be a number.', array('%name' => $element['#title']))); + } +} diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module index fd5367308..3c8132cb3 100644 --- a/modules/field/modules/number/number.module +++ b/modules/field/modules/number/number.module @@ -98,14 +98,14 @@ function number_field_instance_settings_form($field, $instance) { '#title' => t('Minimum'), '#default_value' => $settings['min'], '#description' => t('The minimum value that should be allowed in this field. Leave blank for no minimum.'), - '#element_validate' => array('element_validate_number'), + '#element_validate' => array('_element_validate_number'), ); $form['max'] = array( '#type' => 'textfield', '#title' => t('Maximum'), '#default_value' => $settings['max'], '#description' => t('The maximum value that should be allowed in this field. Leave blank for no maximum.'), - '#element_validate' => array('element_validate_number'), + '#element_validate' => array('_element_validate_number'), ); $form['prefix'] = array( '#type' => 'textfield', diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index d73814faa..89c605cf2 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -71,7 +71,7 @@ function text_field_settings_form($field, $instance, $has_data) { '#default_value' => $settings['max_length'], '#required' => TRUE, '#description' => t('The maximum length of the field in characters.'), - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), // @todo: If $has_data, add a validate handler that only allows // max_length to increase. '#disabled' => $has_data, @@ -227,7 +227,7 @@ function text_field_formatter_settings_form($field, $instance, $view_mode, $form '#type' => 'textfield', '#size' => 10, '#default_value' => $settings['trim_length'], - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), '#required' => TRUE, ); } @@ -480,7 +480,7 @@ function text_field_widget_settings_form($field, $instance) { '#title' => t('Size of textfield'), '#default_value' => $settings['size'], '#required' => TRUE, - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), ); } else { @@ -489,7 +489,7 @@ function text_field_widget_settings_form($field, $instance) { '#title' => t('Rows'), '#default_value' => $settings['rows'], '#required' => TRUE, - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), ); } diff --git a/modules/field_ui/field_ui.api.php b/modules/field_ui/field_ui.api.php index b6446520a..e07a9373d 100644 --- a/modules/field_ui/field_ui.api.php +++ b/modules/field_ui/field_ui.api.php @@ -42,7 +42,7 @@ function hook_field_settings_form($field, $instance, $has_data) { '#title' => t('Maximum length'), '#default_value' => $settings['max_length'], '#required' => FALSE, - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), '#description' => t('The maximum length of the field in characters. Leave blank for an unlimited size.'), ); return $form; @@ -113,7 +113,7 @@ function hook_field_widget_settings_form($field, $instance) { '#type' => 'textfield', '#title' => t('Size of textfield'), '#default_value' => $settings['size'], - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), '#required' => TRUE, ); } @@ -122,7 +122,7 @@ function hook_field_widget_settings_form($field, $instance) { '#type' => 'textfield', '#title' => t('Rows'), '#default_value' => $settings['rows'], - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), '#required' => TRUE, ); } @@ -160,7 +160,7 @@ function hook_field_formatter_settings_form($field, $instance, $view_mode, $form '#type' => 'textfield', '#size' => 20, '#default_value' => $settings['trim_length'], - '#element_validate' => array('element_validate_integer_positive'), + '#element_validate' => array('_element_validate_integer_positive'), '#required' => TRUE, ); } |