diff options
author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
commit | d30df0790818d77b81ee8b271b9bd8ebe3063ee7 (patch) | |
tree | d3a9b32815252caabcf16f593fbf4e2080cff93f /actions/accesstoken.php | |
parent | f798d1ea430d25c2f4a60179c65b39b1257a5340 (diff) | |
parent | b79fef307481b36b4d04dbabb54e3f6d9edf6896 (diff) |
Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
Diffstat (limited to 'actions/accesstoken.php')
-rw-r--r-- | actions/accesstoken.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/accesstoken.php b/actions/accesstoken.php index bb68d3314..46b43c702 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -59,7 +59,7 @@ class AccesstokenAction extends Action try { common_debug('getting request from env variables', __FILE__); common_remove_magic_from_request(); - $req = OAuthRequest::from_request('POST', common_locale_url('accesstoken')); + $req = OAuthRequest::from_request('POST', common_local_url('accesstoken')); common_debug('getting a server', __FILE__); $server = omb_oauth_server(); common_debug('fetching the access token', __FILE__); |