diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
| commit | dccd2da3563389a37ccddbb166bbb3b5ed3a0124 (patch) | |
| tree | 31b646818c906339f01bd4538aee7364f5ef8c9d /mod/xrd.php | |
| parent | e986fc3e301f2a0cfb3b975fe60974fc5dcfd76b (diff) | |
| parent | 44d7c6aac3548e94e35aed87ba7c06b04f374fc2 (diff) | |
| download | volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.gz volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.bz2 volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.zip | |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'mod/xrd.php')
| -rw-r--r-- | mod/xrd.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/xrd.php b/mod/xrd.php index dae6e4828..a416a2cf3 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -41,6 +41,7 @@ function xrd_init(&$a) { $tpl = file_get_contents('view/xrd_person.tpl'); $o = replace_macros($tpl, array( + '$nick' => $r[0]['nickname'], '$accturi' => $uri, '$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'], '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'], @@ -50,7 +51,8 @@ function xrd_init(&$a) { '$dspr' => $dspr, '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'], '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention', - '$modexp' => 'data:application/magic-public-key,' . $salmon_key + '$modexp' => 'data:application/magic-public-key,' . $salmon_key, + '$bigkey' => salmon_key($r[0]['pubkey']) )); |