summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-08 15:01:40 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-08 15:01:40 +0100
commit98626f1b4b3002c64364d82080246b91aa5e4bd2 (patch)
tree5216da502b1d077570832417f4253cd45e55da70 /system/core
parent7f42d060fb828bfb0bd857ad1a17b91070e52628 (diff)
parent5d27c43d29fc049497010ea62ac7877a64bfed92 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/form_val_config
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Input.php17
-rwxr-xr-xsystem/core/Security.php4
2 files changed, 19 insertions, 2 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index ee15f4013..5a4659a5a 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -699,6 +699,23 @@ class CI_Input {
return (php_sapi_name() === 'cli' OR defined('STDIN'));
}
+ // --------------------------------------------------------------------
+
+ /**
+ * Get Request Method
+ *
+ * Return the Request Method
+ *
+ * @param bool uppercase or lowercase
+ * @return bool
+ */
+ public function method($upper = FALSE)
+ {
+ return ($upper)
+ ? strtoupper($this->server('REQUEST_METHOD'))
+ : strtolower($this->server('REQUEST_METHOD'));
+ }
+
}
/* End of file Input.php */
diff --git a/system/core/Security.php b/system/core/Security.php
index 6f25fb5bb..2bffa41b7 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -138,8 +138,8 @@ class CI_Security {
*/
public function csrf_verify()
{
- // If no POST data exists we will set the CSRF cookie
- if (count($_POST) === 0)
+ // If it's not a POST request we will set the CSRF cookie
+ if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST')
{
return $this->csrf_set_cookie();
}