summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-09-03 18:34:30 -0400
committerCraig Andrews <candrews@integralblue.com>2009-09-03 18:35:46 -0400
commit5974871b7b00bd8e3f28dc5f5a9465a9eec0d3d3 (patch)
tree86512cf56a298ab56deab56a7dd28a5b0321d592
parent94f9ce26e78bb9a299f4a41686c9a503f3747aaf (diff)
Improve OAuth CGI compatibility
Fixes http://status.net/trac/ticket/1822 Reported upstream at http://code.google.com/p/oauth/issues/detail?id=118
-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);
}