Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix url and network display

* master:
This commit is contained in:
Simon L'nu 2012-02-28 16:43:08 -05:00
commit 21d1dc48a8

View file

@ -63,7 +63,8 @@ function viewcontacts_content(&$a) {
'username' => $rr['name'],
'url' => $url,
'sparkle' => '',
'item' => $rr,
'itemurl' => $rr['url'],
'network' => network_to_name($rr['network']),
);
}