summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-05 11:33:17 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-07-05 11:33:17 -0400
commit5fe1af94b2fac526d31ab60c41fcb18bdbc991b0 (patch)
tree18095b7195e791e46094880996312a52fc3fce66 /lib/router.php
parentac361791c419126e297e018db9a5fd8b6144c6e2 (diff)
parent53b7fb7f1c4092654c968a3de64d7d0a90d4d403 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php
index 784ea9882..50b733453 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -317,7 +317,7 @@ class Router
$m->connect('api/friendships/:method',
array('action' => 'api',
'apiaction' => 'friendships'),
- array('method' => 'exists(\.(xml|json))'));
+ array('method' => '(show|exists)(\.(xml|json))'));
// Social graph