Merge branch '0.9.x' into righttoleave

2010-12-15 16:48:28 -05:00
parent d840578aa0 0330bad688
commit e16cb8c03a
8 changed files with 441 additions and 21 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -907,8 +907,8 @@ class Router
            // AtomPub API

            $m->connect('api/statusnet/app/service/:id.xml',
-                        array('action' => 'ApiAtomService',
-                              'id' => Nickname::DISPLAY_FMT));
+                        array('action' => 'ApiAtomService'),
+                        array('id' => Nickname::DISPLAY_FMT));

            $m->connect('api/statusnet/app/service.xml',
                        array('action' => 'ApiAtomService'));