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

* remotes/upstream/master: fix url and network display * master:
2012-02-28 16:43:08 -05:00 · 2012-02-28 16:43:08 -05:00 · 21d1dc48a8
parent 718c5ea23e 733f830be4
commit 21d1dc48a8
1 changed files with 2 additions and 1 deletions
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@ -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']),
 		);
 	}