summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-08 01:24:53 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-08 01:24:53 +0200
commit1f6f0abf0d17046a99fd9c9b3c60fb459b4531b1 (patch)
treef86e15a5a38a441a03a8f999a1e21b9ac278ddb1
parent1224f191d48d6dce920138a82e142134cc0b5231 (diff)
Fixing a bug in the form_helper where csrf_token_name and csrf_hash were referencing class properties in the Security class that were moved.
-rw-r--r--system/helpers/form_helper.php2
-rw-r--r--user_guide/installation/upgrade_202.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 8aa788c6c..acd75c239 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -67,7 +67,7 @@ if ( ! function_exists('form_open'))
// CSRF
if ($CI->config->item('csrf_protection') === TRUE)
{
- $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash;
+ $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();
}
if (is_array($hidden) AND count($hidden) > 0)
diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html
index e6273f53c..d457d8bbb 100644
--- a/user_guide/installation/upgrade_202.html
+++ b/user_guide/installation/upgrade_202.html
@@ -76,6 +76,8 @@ Upgrading from 2.0.1 to 2.0.2
<p>If you are overriding or extending the Security library, you will need to move it to <kbd>application/core</kbd>.</p>
+<p><samp>csrf_token_name</samp> and <samp>csrf_hash</samp> have changed to protected class properties. Please use <samp>security->get_csrf_hash()</samp> and <samp>security->get_csrf_token_name()</samp> to access those values.</p>
+
</div>
<!-- END CONTENT -->