eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'gitorious/1.0.x' into 1.0.x

Browse Source
This commit is contained in:
Evan Prodromou
2010-10-05 14:09:17 -04:00
parent 829a017a5d 5c4723919f
commit 8aa9c271df
1108 changed files with 122167 additions and 26491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/router.php
View File

@@ -490,19 +490,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
@@ -680,13 +680,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
@@ -698,6 +698,7 @@ class Router
$m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
$m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
$m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
$m->connect('admin/license', array('action' => 'licenseadminpanel'));
$m->connect('admin/plugins', array('action' => 'pluginsadminpanel'));
$m->connect('admin/plugins/enable/:plugin',
array('action' => 'pluginenable'),