removed ip_version()
diff --git a/system/core/Input.php b/system/core/Input.php
index c1f2086..b986c49 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -383,27 +383,7 @@
*/
public function valid_ip($ip)
{
- if ($this->ip_version($ip) === 4)
- {
- return (bool) filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
- }
- else
- {
- return (bool) filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
- }
- }
-
- // --------------------------------------------------------------------
-
- /**
- * Return ip version
- *
- * @param string
- * @return int
- */
- public function ip_version($ip)
- {
- return strpos($ip, ":") === FALSE ? 4 : 6;
+ return (bool) filter_var($ip, FILTER_VALIDATE_IP);
}
// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
index 3682d30..c9322c0 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -158,18 +158,4 @@
}
}
- // --------------------------------------------------------------------
-
- public function test_ip_version()
- {
- $ip_v4 = '192.18.0.1';
- $this->assertEquals(4, $this->input->ip_version($ip_v4));
-
- $ip_v6 = array('2001:0db8:0000:85a3:0000:0000:ac1f:8001', '2001:db8:0:85a3:0:0:ac1f:8001', '2001:db8:0:85a3::ac1f:8001');
- foreach($ip_v6 as $ip)
- {
- $this->assertEquals(6, $this->input->ip_version($ip));
- }
- }
-
}
\ No newline at end of file
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3118b7d..0b987b1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,7 +135,7 @@
- Allowed for setting table class defaults in a config file.
- Added a Wincache driver to the :doc:`Caching Library <libraries/caching>`.
- Added dsn (delivery status notification) option to the :doc:`Email Library <libraries/email>`.
- - Input library now supports IPv6 and has a ip_version() method.
+ - Input library now supports IPv6.
- Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library <libraries/email>`.
- Core
diff --git a/user_guide_src/source/libraries/input.rst b/user_guide_src/source/libraries/input.rst
index 649fe43..abdf877 100644
--- a/user_guide_src/source/libraries/input.rst
+++ b/user_guide_src/source/libraries/input.rst
@@ -242,15 +242,6 @@
echo 'Valid';
}
-$this->input->ip_version($ip)
-============================
-
-Takes an IP address as input and returns the version : 4 or 6.
-::
-
- $ip = '175.123.74.43';
- echo $this->input->ip_version($ip); // 4
-
$this->input->user_agent()
===========================