diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-30 02:31:48 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-30 02:31:48 +0200 |
| commit | b50df5f018176c0cd0ad498e9c710a2b0b016a80 (patch) | |
| tree | 95733dbbcc348a92aad5d979db2e5da471859c25 /system/core/Input.php | |
| parent | c964e72aabc3a646dbb82f6bf609e9532e75d011 (diff) | |
| parent | d7a28663344fbb760134b5623b8cb441f4875f80 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Input.php')
| -rwxr-xr-x | system/core/Input.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index 5a033e7b8..0dc2c4550 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -323,13 +323,13 @@ class CI_Input { $this->ip_address = in_array($_SERVER['REMOTE_ADDR'], $proxies) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']; } - elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) + elseif (! $this->server('HTTP_CLIENT_IP') AND $this->server('REMOTE_ADDR')) { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + $this->ip_address = $_SERVER['REMOTE_ADDR']; } - elseif ($this->server('REMOTE_ADDR')) + elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) { - $this->ip_address = $_SERVER['REMOTE_ADDR']; + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; } elseif ($this->server('HTTP_CLIENT_IP')) { |