diff options
| -rw-r--r-- | .hgignore | 7 | ||||
| -rw-r--r-- | license.txt | 3 | ||||
| -rwxr-xr-x | system/core/CodeIgniter.php | 2 | ||||
| -rwxr-xr-x | system/helpers/form_helper.php | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/.hgignore b/.hgignore new file mode 100644 index 000000000..5ee4d823e --- /dev/null +++ b/.hgignore @@ -0,0 +1,7 @@ +syntax: glob + +.DS_Store + +syntax: regexp +application/cache/(?!index\.html|\.htaccess) +application/logs/(?!index\.html|\.htaccess) diff --git a/license.txt b/license.txt index f64fd9510..061cdb9db 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2008 - 2010, EllisLab, Inc. +Copyright (c) 2008 - 2011, EllisLab, Inc. All rights reserved. This license is a legal agreement between you and EllisLab Inc. for the use @@ -29,7 +29,6 @@ the following conditions are met: nor may "CodeIgniter" appear in their name, without prior written permission from EllisLab, Inc. - INDEMNITY You agree to indemnify and hold harmless the authors of the Software and any contributors for any direct, indirect, incidental, or consequential diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index e022e1b46..f3e1439ff 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -32,7 +32,7 @@ * Define the CodeIgniter Version * ------------------------------------------------------ */ - define('CI_VERSION', '2.0.2'); + define('CI_VERSION', '2.0.1'); /* * ------------------------------------------------------ diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index acd75c239..8aa788c6c 100755 --- 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->get_csrf_token_name()] = $CI->security->get_csrf_hash(); + $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash; } if (is_array($hidden) AND count($hidden) > 0) |