From 84f06dda86eaf3fa6a210031a5391f9efb72af85 Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Fri, 22 Oct 2010 00:44:47 +0000 Subject: [PATCH] - Patch #946646 by yched: move helper #element_functions() out of Field UI. --- modules/field/field.module | 30 +++++++++++++++++++++++++++++ modules/field_ui/field_ui.admin.inc | 30 ----------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/field/field.module b/modules/field/field.module index d02599a01941..823b0f24c010 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -966,3 +966,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_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index ffa7330f62f0..27ff1e03ad69 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -1946,33 +1946,3 @@ function field_ui_next_destination($entity_type, $bundle) { $admin_path = _field_ui_bundle_admin_path($entity_type, $bundle); return $admin_path . '/fields'; } - -/** - * 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']))); - } -} -- GitLab