summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-07 23:12:10 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-07 23:12:10 +0200
commit05b3877a792caa23cb4503a976b8c85dec47335f (patch)
tree86006127e3e581dc23c0f393a08c42e664897d76 /system/core
parent481e42660f3c703789b4564402b5c47032c87c99 (diff)
Bump version number to 2.1.3
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/CodeIgniter.php2
-rwxr-xr-xsystem/core/Input.php4
2 files changed, 3 insertions, 3 deletions
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