summaryrefslogtreecommitdiffstats
path: root/system/core/Security.php
diff options
context:
space:
mode:
authorbrian978 <dbrian89@yahoo.com>2012-12-18 12:23:14 +0100
committerbrian978 <dbrian89@yahoo.com>2012-12-18 12:23:14 +0100
commit0fb101849e53593fdceb7064f32ea5176e6eed16 (patch)
treee33629f2352da2715d559364af955d6dda59d203 /system/core/Security.php
parent07ccbe59cf9d78d944551f810a14064e979840a3 (diff)
parentd8dba5d3ecbe1ff4502b04a9cf3086908db140d1 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/core/Security.php')
-rw-r--r--system/core/Security.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 70e9e973c..8c70e85de 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -151,7 +151,7 @@ class CI_Security {
/**
* CSRF Verify
*
- * @return object
+ * @return CI_Security
*/
public function csrf_verify()
{
@@ -202,7 +202,7 @@ class CI_Security {
* CSRF Set Cookie
*
* @codeCoverageIgnore
- * @return object
+ * @return CI_Security
*/
public function csrf_set_cookie()
{