diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-02 10:28:57 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-02 10:28:57 +0000 |
| commit | 412052cd7e721c3483baf6aecc6d6e92cc7ebef7 (patch) | |
| tree | 4671d77b26845f9d7d1fd45184266da00bfbabc0 | |
| parent | c9f6c09af0e63a564a81ef5560de2892773a4fe2 (diff) | |
| parent | 4abbf440682050c27ba76c3b1de19d5134ab99f7 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
| -rw-r--r-- | lib/router.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/router.php b/lib/router.php index 64853e419..888cbdd20 100644 --- a/lib/router.php +++ b/lib/router.php @@ -360,11 +360,6 @@ class Router 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json)')); - $m->connect('api/users/:method', - array('action' => 'api', - 'apiaction' => 'users'), - array('method' => 'show(\.(xml|json))?')); - // direct messages $m->connect('api/direct_messages.:format', @@ -459,13 +454,6 @@ class Router array('action' => 'ApiFavoriteDestroy', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json)')); - - // notifications - - $m->connect('api/notifications/:method/:argument', - array('action' => 'api', - 'apiaction' => 'favorites')); - // blocks $m->connect('api/blocks/create/:id.:format', |