summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-09-22 23:30:50 +0000
committerZach Copley <zach@status.net>2010-09-22 23:33:06 +0000
commit84331ca7bd2a93283762b638eb25bbbd7d5e36f7 (patch)
treeeb043f8ea77c833b67d099778d6fb16244ad2409
parent870be512d23f4f6dadb97a72fec45a9596ac62ef (diff)
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
login page when a site is in private mode
-rw-r--r--actions/apioauthauthorize.php2
-rw-r--r--lib/router.php14
2 files changed, 8 insertions, 8 deletions
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index e7c6f3761..c2fbbcdd8 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -270,7 +270,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction
$this->elementStart('form', array('method' => 'post',
'id' => 'form_apioauthauthorize',
'class' => 'form_settings',
- 'action' => common_local_url('apioauthauthorize')));
+ 'action' => common_local_url('ApiOauthAuthorize')));
$this->elementStart('fieldset');
$this->element('legend', array('id' => 'apioauthauthorize_allowdeny'),
_('Allow or deny access'));
diff --git a/lib/router.php b/lib/router.php
index fb5a3c7c3..00b299373 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -488,19 +488,19 @@ class Router
// Social graph
$m->connect('api/friends/ids/:id.:format',
- array('action' => 'apiuserfriends',
+ array('action' => 'ApiUserFriends',
'ids_only' => true));
$m->connect('api/followers/ids/:id.:format',
- array('action' => 'apiuserfollowers',
+ array('action' => 'ApiUserFollowers',
'ids_only' => true));
$m->connect('api/friends/ids.:format',
- array('action' => 'apiuserfriends',
+ array('action' => 'ApiUserFriends',
'ids_only' => true));
$m->connect('api/followers/ids.:format',
- array('action' => 'apiuserfollowers',
+ array('action' => 'ApiUserFollowers',
'ids_only' => true));
// account
@@ -672,13 +672,13 @@ class Router
$m->connect('api/trends.json', array('action' => 'ApiTrends'));
$m->connect('api/oauth/request_token',
- array('action' => 'apioauthrequesttoken'));
+ array('action' => 'ApiOauthRequestToken'));
$m->connect('api/oauth/access_token',
- array('action' => 'apioauthaccesstoken'));
+ array('action' => 'ApiOauthAccessToken'));
$m->connect('api/oauth/authorize',
- array('action' => 'apioauthauthorize'));
+ array('action' => 'ApiOauthAuthorize'));
// Admin