Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index bb68d3314d49efea773f0cc6f304d308ec2636a2..46b43c70216e106a5722434c38f365d56c0d3cc5 100644 (file)
--- 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 d2f0a2eff0f7a47c1038939970d1fe0fd9a2cd32..8762b4bcd3efc974831252987f72b8bb33bd4041 100644 (file)
--- 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');