summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-09-20 10:36:34 +0200
committerAndrey Andreev <narf@bofh.bg>2012-09-20 10:36:34 +0200
commit4cfde87eb65a28d03e3f02be634a96aedd79dae2 (patch)
tree66dd749fb7225ab4af13fc69970d848171192141 /system
parent628c77c28b62a0d564aee29cf7b12b338c0e7607 (diff)
parent14c9331420c960ff3237c2d82e34f7ebf8c6f12a (diff)
Merge pull request #1816 from progmedia/develop
Fixes issue #1815 - input::ip_address() returns incorrect IP behind prox...
Diffstat (limited to 'system')
-rw-r--r--system/core/Input.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index 968a42a9a..5b8e62389 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -383,7 +383,7 @@ class CI_Input {
if (strpos($this->ip_address, ',') !== FALSE)
{
$x = explode(',', $this->ip_address);
- $this->ip_address = trim(end($x));
+ $this->ip_address = trim($x[0]);
}
if ( ! $this->valid_ip($this->ip_address))