diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-10 05:18:14 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-10 05:18:14 +0200 |
| commit | 5a257187c4ca09ea61c19999bf061cec3f224cc2 (patch) | |
| tree | 56f5208bac5394f37c16e62625a149b3746d8e23 /system/libraries | |
| parent | 92aa67cf67292b20cfb8f18fc9e24b7408620355 (diff) | |
Merge branch 2.1-stable into develop
Diffstat (limited to 'system/libraries')
| -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 225325d6f..77c968e7c 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1089,11 +1089,12 @@ class CI_Form_validation { * Validate IP Address * * @param string + * @param string 'ipv4' or 'ipv6' to validate a specific IP format * @return bool */ - 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); } // -------------------------------------------------------------------- |