diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
| commit | 7d33478e867cc6610aded42a8f2fa71bae46804d (patch) | |
| tree | 73a422fac7006ee40ff51c21922ca22f68cab40d /lib/router.php | |
| parent | 01dccefcccc8ca4c1fec419f47cf723d0498c3ef (diff) | |
| parent | 853b6d38b362e3a905195d9ff850c9a884d412bd (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/router.php b/lib/router.php index f03cfcf6d..04c6dd414 100644 --- a/lib/router.php +++ b/lib/router.php @@ -117,15 +117,8 @@ class Router $m->connect('main/tagother/:id', array('action' => 'tagother')); - $m->connect('main/oembed.xml', - array('action' => 'api', - 'method' => 'oembed.xml', - 'apiaction' => 'oembed')); - - $m->connect('main/oembed.json', - array('action' => 'api', - 'method' => 'oembed.json', - 'apiaction' => 'oembed')); + $m->connect('main/oembed', + array('action' => 'oembed')); // these take a code |