summaryrefslogtreecommitdiff
path: root/extlib/OAuth.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-15 17:16:35 -0400
committerEvan Prodromou <evan@status.net>2009-09-15 17:16:35 -0400
commit13147143fc830e81b80ae86bf4cc4f745ce04381 (patch)
tree7197e7c3437e028a1bc2358f38ac3964cf3fe6e9 /extlib/OAuth.php
parente559f82e86c495abdc4cf5fff3d8c6279a808354 (diff)
parent4081ed79b02fd06f7c347803478e1f835311c2ab (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/OAuth.php')
-rw-r--r--extlib/OAuth.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/extlib/OAuth.php b/extlib/OAuth.php
index 029166175..fd4853554 100644
--- a/extlib/OAuth.php
+++ b/extlib/OAuth.php
@@ -199,7 +199,8 @@ class OAuthRequest {/*{{{*/
} else {
// collect request parameters from query string (GET) and post-data (POST) if appropriate (note: POST vars have priority)
$req_parameters = $_GET;
- if ($http_method == "POST" && @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") ) {
+ if ($http_method == "POST" &&
+ ( @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") || @strstr($_ENV["CONTENT_TYPE"], "application/x-www-form-urlencoded") )) {
$req_parameters = array_merge($req_parameters, $_POST);
}