From 1ab6f6520ebfc016c49cfbe3a4d9d009be5da268 Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux <j.jaffeux@gmail.com>
Date: Wed, 6 Jun 2012 20:14:13 +0200
Subject: removed ip_version()

---
 system/core/Input.php                     | 22 +---------------------
 tests/codeigniter/core/Input_test.php     | 14 --------------
 user_guide_src/source/changelog.rst       |  2 +-
 user_guide_src/source/libraries/input.rst |  9 ---------
 4 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/system/core/Input.php b/system/core/Input.php
index c1f2086c4..b986c4973 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -383,27 +383,7 @@ class CI_Input {
 	 */
 	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 3682d308d..c9322c027 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -158,18 +158,4 @@ class Input_test extends CI_TestCase {
 		}
 	}
 
-	// --------------------------------------------------------------------
-	
-	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 3118b7dc5..0b987b1be 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,7 +135,7 @@ Release Date: Not Released
    -  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 649fe43d6..abdf87704 100644
--- a/user_guide_src/source/libraries/input.rst
+++ b/user_guide_src/source/libraries/input.rst
@@ -242,15 +242,6 @@ validates the IP automatically.
 	     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()
 ===========================
 
-- 
cgit v1.2.3-24-g4f1b