diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-07-03 15:43:14 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-07-03 15:43:14 -0700 |
| commit | e3c70cc30cc87265d07f28af5357f5090b2d9935 (patch) | |
| tree | 5f1bea456eca04c7d4b60d5d0d4e113ba4ee6ad2 /lib/router.php | |
| parent | 2881b553fec5167c8252f7c55247345e1af11be5 (diff) | |
| parent | a2a4cc35f6db17e381d3f42b227d86fac12e81a8 (diff) | |
Merge branch 'friendships_show' into 0.8.x
* friendships_show:
Implement friendships/show API method
Route and stub for new friendships/show API method
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 2 |
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 |