summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-02-05 17:59:45 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-02-05 17:59:45 +0100
commit42b2e1738d56f6ce08b104aedacf0f204c8ee1a9 (patch)
treeaab0ac829b04d1b7b74ac8574f6f43e401f504b2 /system
parent97707cc6e51d77ded02deba6d3d8d2c5867cab83 (diff)
... replaced $CFG->item() with config_item()
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Input.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 0679d0188..b6498f869 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -347,11 +347,9 @@ class CI_Input {
return $this->ip_address;
}
- $CFG =& load_class('Config');
-
- if ($CFG->item('proxy_ips') != '' && $this->server('HTTP_X_FORWARDED_FOR') && $this->server('REMOTE_ADDR'))
+ if (config_item('proxy_ips') != '' && $this->server('HTTP_X_FORWARDED_FOR') && $this->server('REMOTE_ADDR'))
{
- $proxies = preg_split('/[\s,]/', $CFG->item('proxy_ips'), -1, PREG_SPLIT_NO_EMPTY);
+ $proxies = preg_split('/[\s,]/', config_item('proxy_ips'), -1, PREG_SPLIT_NO_EMPTY);
$proxies = is_array($proxies) ? $proxies : array($proxies);
$this->ip_address = in_array($_SERVER['REMOTE_ADDR'], $proxies) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];