diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 08:00:41 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 08:00:41 -0700 |
| commit | 1a61a171cdb39444e2c0fbed7cf3a92e0ec271df (patch) | |
| tree | edf2eb852163f3806d813ac6292ab67be1aed40f /lib/router.php | |
| parent | a86a0e91a5acb5ea894a3d066f9adf3b1ef305ae (diff) | |
| parent | 19a21947046062fc0cc313b23ae7418d317def89 (diff) | |
Merge branch '0.7.x' into cometplugin
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index 6fb2f9487..12590b790 100644 --- a/lib/router.php +++ b/lib/router.php @@ -231,12 +231,12 @@ class Router $m->connect('api/statuses/:method', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|friends|followers|featured)(\.(atom|rss|xml|json))?')); + array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?')); $m->connect('api/statuses/:method/:argument', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(user_timeline|friends_timeline|replies|show|destroy|friends|followers)')); + array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)')); // users |