diff options
author | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
---|---|---|
committer | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
commit | 7c8031dc4bf6ece83db893e13d89ced10c2f6b62 (patch) | |
tree | 9b48e3d511642450ac0566b00cfb6f2d8ae109aa /lib/router.php | |
parent | 855692141d531287b179841b8816e90023b6ba7b (diff) | |
parent | 02300ebfb08bfcd52f4ab34d1041455079ebf2ec (diff) |
Merge remote branch 'statusnet/testing' into testing
Conflicts:
plugins/OStatus/lib/webfinger.php
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 0e15d83b9..abbce041d 100644 --- a/lib/router.php +++ b/lib/router.php @@ -671,7 +671,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'xrds', - 'replies', 'microsummary') as $a) { + 'replies', 'microsummary', 'hcard') as $a) { $m->connect($a, array('action' => $a, 'nickname' => $nickname)); @@ -737,7 +737,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'nudge', 'all', 'foaf', 'xrds', - 'replies', 'inbox', 'outbox', 'microsummary') as $a) { + 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); |