Merge branch 'master' of github.com:facebook/tornado
This commit is contained in:
commit
40dc1f098a
|
@ -1069,7 +1069,7 @@ class FacebookGraphMixin(OAuth2Mixin):
|
||||||
if access_token:
|
if access_token:
|
||||||
all_args["access_token"] = access_token
|
all_args["access_token"] = access_token
|
||||||
all_args.update(args)
|
all_args.update(args)
|
||||||
all_args.update(post_args or {})
|
|
||||||
if all_args:
|
if all_args:
|
||||||
url += "?" + urllib.urlencode(all_args)
|
url += "?" + urllib.urlencode(all_args)
|
||||||
callback = self.async_callback(self._on_facebook_request, callback)
|
callback = self.async_callback(self._on_facebook_request, callback)
|
||||||
|
|
Loading…
Reference in New Issue