summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
committerAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
commit79edb997be293e997afc5e008125bf334855f4d4 (patch)
tree742c7065c8fa55fdcce26652bc82d52976554c8a /system/core
parent2cec39f2c221d2acab5dbd830b6dd64db01b24d9 (diff)
parent0f614c692eb2db49da98b8eca6247bd8c245a64e (diff)
Merge upstream changes
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/CodeIgniter.php20
-rwxr-xr-xsystem/core/Input.php2
-rwxr-xr-xsystem/core/Security.php3
3 files changed, 3 insertions, 22 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index aca4fb23c..9f88384b1 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -33,28 +33,8 @@
* @var string
*
*/
- /**
- * CodeIgniter Version
- *
- * @var string
- *
- */
define('CI_VERSION', '2.1.0-dev');
-/**
- * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
- *
- * @var boolean
- *
- */
- /**
- * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
- *
- * @var string
- *
- */
- define('CI_CORE', FALSE);
-
/*
* ------------------------------------------------------
* Load the global functions
diff --git a/system/core/Input.php b/system/core/Input.php
index f39371fb0..6f8442107 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -555,7 +555,7 @@ class CI_Input {
}
// We strip slashes if magic quotes is on to keep things consistent
- if (function_exists('get_magic_quotes_gpc') AND get_magic_quotes_gpc())
+ if (function_exists('get_magic_quotes_gpc') AND @get_magic_quotes_gpc())
{
$str = stripslashes($str);
}
diff --git a/system/core/Security.php b/system/core/Security.php
index 6c4c59057..84ecb06db 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -886,7 +886,8 @@ class CI_Security {
return $this->_csrf_hash = $_COOKIE[$this->_csrf_cookie_name];
}
- return $this->_csrf_hash = md5(uniqid(rand(), TRUE));
+ $this->_csrf_hash = md5(uniqid(rand(), TRUE));
+ $this->csrf_set_cookie();
}
return $this->_csrf_hash;