diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/xrd_person.tpl | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/xrd_person.tpl')
-rwxr-xr-x | view/tpl/xrd_person.tpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 631ed3f18..93fdcb1df 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -2,7 +2,10 @@ <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>{{$accturi}}</Subject> - + {{if $aliases}}{{foreach $aliases as $a}} + <Alias>{{$a}}</Alias> + {{/foreach}}{{/if}} + <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="{{$atom}}" /> @@ -17,6 +20,8 @@ <Link rel="http://microformats.org/profile/hcard" type="text/html" href="{{$hcard_url}}" /> + <Link rel="http://ostatus.org/schema/1.0/subscribe" + template="{{$subscribe}}" /> <Link rel="magic-public-key" href="{{$modexp}}" /> |