summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatwork <patwork@gmail.com>2011-04-11 13:02:32 +0200
committerpatwork <patwork@gmail.com>2011-04-11 13:02:32 +0200
commit9e2679849611ce050f5636c44b6c3279328d00f9 (patch)
treeda881113ee460469bc65561854cb335e8f0961d5
parent571023b24f705d9c0bbaecf2e3cbbc06752390b4 (diff)
Fix: codeigniter-reactor/199 cookie name was overwritten with token name
-rw-r--r--system/core/Security.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 73a3cfb31..4f91572ed 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -67,8 +67,10 @@ class CI_Security {
}
}
- // Append application specific cookie prefix to token name
- $this->_csrf_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->_csrf_token_name : $this->_csrf_token_name;
+ // Append application specific cookie prefix
+ if (config_item('cookie_prefix')) {
+ $this->_csrf_cookie_name = config_item('cookie_prefix').$this->_csrf_cookie_name;
+ }
// Set the CSRF hash
$this->_csrf_set_hash();