diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 07:13:19 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 07:13:19 -0400 |
| commit | 19a21947046062fc0cc313b23ae7418d317def89 (patch) | |
| tree | 23aaecf3e257f84627a1531ad0ea18ea673b7f24 | |
| parent | 609ac4c22463af88c206968134ab16e75e500edd (diff) | |
| parent | b79fef307481b36b4d04dbabb54e3f6d9edf6896 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
| -rw-r--r-- | actions/accesstoken.php | 2 | ||||
| -rw-r--r-- | actions/api.php | 1 |
2 files changed, 2 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__); diff --git a/actions/api.php b/actions/api.php index d2f0a2eff..8762b4bcd 100644 --- a/actions/api.php +++ b/actions/api.php @@ -130,6 +130,7 @@ class ApiAction extends Action 'statuses/friends_timeline', 'statuses/friends', 'statuses/replies', + 'statuses/mentions', 'statuses/followers', 'favorites/favorites'); |