diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-11 15:16:35 +0200 |
| commit | 686ff126762c0923556036a3cf73abb9390a7e67 (patch) | |
| tree | c0aedf7f9ce68ed3e5880f9f1ba14ddf03eb7083 /system/libraries/Form_validation.php | |
| parent | 918eaef728eaf49387083b39add7106e029fcfb4 (diff) | |
| parent | cef5bda9765080b818898811023d9ab427b0faf2 (diff) | |
Fixed conflicts
Why were there conflicts merging into master?
Diffstat (limited to 'system/libraries/Form_validation.php')
| -rw-r--r-- | system/libraries/Form_validation.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index a34809e05..9aab5da4b 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1079,11 +1079,12 @@ class CI_Form_validation { * * @access public * @param string + * @param string "ipv4" or "ipv6" to validate a specific ip format * @return string */ - public function valid_ip($ip) + public function valid_ip($ip, $which = '') { - return $this->CI->input->valid_ip($ip); + return $this->CI->input->valid_ip($ip, $which); } // -------------------------------------------------------------------- |