diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:09:55 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:09:55 -0700 |
| commit | 004200f95869c640004d920b741fd9f07835a3e2 (patch) | |
| tree | c5cec905d270d343779ee4bff3dd07f75ad6b7fb /lib/router.php | |
| parent | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (diff) | |
| parent | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.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 ef5fece13..6cbae8247 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', @@ -664,7 +664,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( |