diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2010-10-07 00:52:21 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2010-10-07 00:52:21 +0200 |
| commit | 124ac667046bfb662f4165934d953c0c8bded284 (patch) | |
| tree | 8656623f4baa525c28933cc8a900502af10e53ae | |
| parent | 2ef375969b77c5fdf84118d4a7a8e0bc97d9d2f6 (diff) | |
| parent | 49ced91d1f5ab50068a66fdddff6be3f5c420565 (diff) | |
merging changes
| -rw-r--r-- | application/config/config.php | 4 | ||||
| -rw-r--r-- | system/libraries/Javascript.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/application/config/config.php b/application/config/config.php index 3f2be480f..0b85ac5fc 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -274,9 +274,9 @@ $config['global_xss_filtering'] = FALSE; /* |-------------------------------------------------------------------------- -| Cross Site Forgery Request +| Cross Site Request Forgery |-------------------------------------------------------------------------- -| Enables a CSFR cookie token to be set. When set to TRUE, token will be +| Enables a CSRF cookie token to be set. When set to TRUE, token will be | checked on a submitted form. If you are accepting user data, it is strongly | recommended CSRF protection be enabled. */ diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index efaaab4bf..c149bb111 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Javascript * @author ExpressionEngine Dev Team - * @link http://codeigniter.com/user_guide/general/errors.html + * @link http://codeigniter.com/user_guide/libraries/javascript.html */ class CI_Javascript { |