summaryrefslogtreecommitdiff
path: root/extlib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-09-04 07:19:01 -0700
committerBrion Vibber <brion@pobox.com>2009-09-04 07:19:01 -0700
commitd635a0685df324d75e66d1f28dae4223c77a0875 (patch)
treeb19672b922b74760700a3882642cafae4190afdd /extlib
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
parent5974871b7b00bd8e3f28dc5f5a9465a9eec0d3d3 (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/mainline into 0.9.x
Diffstat (limited to 'extlib')
-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);
}