Merge branch 'master' of github.com:lncd/OAuth2

Conflicts:
	composer.json

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
This commit is contained in:
Alex Bilbie
2012-09-19 19:32:31 +01:00
2 changed files with 7 additions and 0 deletions

View File

@@ -121,6 +121,9 @@ class Server
{
$accessToken = null;
$_SERVER['REQUEST_METHOD'] = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
// Try and get the access token via an access_token or oauth_token parameter
switch ($_SERVER['REQUEST_METHOD'])
{