Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

2011-09-27 16:59:43 +00:00
parent cd30c94096 baeb84ebb3
commit 8ca9f33f45
15 changed files with 121 additions and 379 deletions
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -77,11 +77,6 @@ class XrdAction extends Action
                                                               'format' => 'atom')),
                              'type' => 'application/atom+xml');

-        // hCard
-        $xrd->links[] = array('rel' => Discovery::HCARD,
-                              'type' => 'text/html',
-                              'href' => common_local_url('hcard', array('nickname' => $nick)));
-
        // XFN
        $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                              'type' => 'text/html',