diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
| commit | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (patch) | |
| tree | 13f137c377c3dfebbb2e749866e958ede08c2d24 /lib/router.php | |
| parent | e81f17e911f59c5ba68fddefd318ea6caf25924c (diff) | |
| parent | 47665e845ae74e6ee5b9a39565fb45dd9a93f921 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/router.php b/lib/router.php index afe44f92a..f2b2b845f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -540,7 +540,7 @@ class Router $m->connect('api/favorites/:id.:format', array('action' => 'ApiTimelineFavorites', 'id' => '[a-zA-Z0-9]+', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); $m->connect('api/favorites/create/:id.:format', array('action' => 'ApiFavoriteCreate', @@ -597,7 +597,7 @@ class Router $m->connect('api/statusnet/groups/timeline/:id.:format', array('action' => 'ApiTimelineGroup', 'id' => '[a-zA-Z0-9]+', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); $m->connect('api/statusnet/groups/show.:format', array('action' => 'ApiGroupShow', @@ -658,7 +658,7 @@ class Router // Tags $m->connect('api/statusnet/tags/timeline/:tag.:format', array('action' => 'ApiTimelineTag', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); // media related $m->connect( |