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

* remotes/upstream/master:
  update globaldir when page-type changes, add spam date field
  clicking contact on contacts page broken link

* master:

1 files changed, 1 insertions, 0 deletions

diff --git a/mod/contacts.php b/mod/contacts.php
index ce352fe20..c99ac1452 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -505,6 +505,7 @@ function contacts_content(&$a) {
 				'username' => $rr['name'],
 				'sparkle' => $sparkle,
 				'itemurl' => $rr['url'],
+				'url' => $url,
 				'network' => network_to_name($rr['network']),
 			);
 		}