Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/lib/router.php b/lib/router.php
index 64853e4198ac720bf2a4c3d6340e3055755ba173..888cbdd20cf55c2b901a9a9f68a467d0a71a0ac7 100644 (file)
--- 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',