summaryrefslogtreecommitdiff
path: root/extlib/OAuth.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-09-09 22:52:38 -0400
committerCraig Andrews <candrews@integralblue.com>2009-09-09 22:52:38 -0400
commitd7ae0ed4fd755ebad0788a17d0f2fb6a6ca9d63b (patch)
treedf58e167fe84f49af11edce4d0a7ebc34e480510 /extlib/OAuth.php
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
parentaecdba1ded89b45f32d0b7615ce6b103478403dd (diff)
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts: lib/omb.php
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);
}