From 49f483d57f4f95fc2b6d35e97ff368f15e97a5ae Mon Sep 17 00:00:00 2001 From: Lance Vincent Date: Wed, 28 Jan 2015 22:46:19 +0800 Subject: change in to in_list --- system/language/english/form_validation_lang.php | 2 +- system/libraries/Form_validation.php | 2 +- user_guide_src/source/libraries/form_validation.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index a66e192e2..75d6e4b82 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -65,4 +65,4 @@ $lang['form_validation_less_than_equal_to'] = 'The {field} field must contain a $lang['form_validation_greater_than'] = 'The {field} field must contain a number greater than {param}.'; $lang['form_validation_greater_than_equal_to'] = 'The {field} field must contain a number greater than or equal to {param}.'; $lang['form_validation_error_message_not_set'] = 'Unable to access an error message corresponding to your field name {field}.'; -$lang['form_validation_in'] = 'The {field} field must be one of: {param}.'; +$lang['form_validation_in_list'] = 'The {field} field must be one of: {param}.'; diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index e81216edb..cfb13ae2e 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1455,7 +1455,7 @@ class CI_Form_validation { * @param array * @return bool */ - public function in($value, $list) + public function in_list($value, $list) { return in_array($value, explode(',', $list), TRUE); } diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst index 4ba3a33b7..2d05d1b2f 100644 --- a/user_guide_src/source/libraries/form_validation.rst +++ b/user_guide_src/source/libraries/form_validation.rst @@ -961,7 +961,7 @@ Rule Parameter Description not numeric. **less_than_equal_to** Yes Returns FALSE if the form element is greater than the parameter value, less_than_equal_to[8] or not numeric. -**in** Yes Returns FALSE if the form element is not within a predetermined list. in[red,blue,green] +**in_list** Yes Returns FALSE if the form element is not within a predetermined list. in_list[red,blue,green] **alpha** No Returns FALSE if the form element contains anything other than alphabetical characters. **alpha_numeric** No Returns FALSE if the form element contains anything other than alpha-numeric characters. **alpha_numeric_spaces** No Returns FALSE if the form element contains anything other than alpha-numeric characters -- cgit v1.2.3-24-g4f1b