From 05b3877a792caa23cb4503a976b8c85dec47335f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 8 Oct 2012 00:12:10 +0300 Subject: Bump version number to 2.1.3 --- system/core/CodeIgniter.php | 2 +- system/core/Input.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'system') diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index cd3333331..c16c79c09 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -33,7 +33,7 @@ * @var string * */ - define('CI_VERSION', '2.1.2'); + define('CI_VERSION', '2.1.3'); /** * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) diff --git a/system/core/Input.php b/system/core/Input.php index 66e02ba00..fa26777a1 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -334,7 +334,7 @@ class CI_Input { if ( ! $this->valid_ip($spoof)) { - $spoof = NULL; + $spoof = FALSE; } else { @@ -343,7 +343,7 @@ class CI_Input { } } - $this->ip_address = ($spoof !== NULL && in_array($_SERVER['REMOTE_ADDR'], $proxy_ips, TRUE)) + $this->ip_address = ($spoof !== FALSE && in_array($_SERVER['REMOTE_ADDR'], $proxy_ips, TRUE)) ? $spoof : $_SERVER['REMOTE_ADDR']; } else -- cgit v1.2.3-24-g4f1b