diff --git a/include/identity.php b/include/identity.php index 9f3e1dda0..0fba0c592 100644 --- a/include/identity.php +++ b/include/identity.php @@ -285,6 +285,7 @@ if(! function_exists('profile_sidebar')) { $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname)))); $diaspora = array( + 'guid' => $profile['guid'], 'podloc' => $a->get_baseurl(), 'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ), 'nickname' => $profile['nickname'], diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl index 25a0fe0fc..58419bd13 100644 --- a/view/templates/diaspora_vcard.tpl +++ b/view/templates/diaspora_vcard.tpl @@ -1,34 +1,45 @@
+
+
Uid
+
+ {{$diaspora.guid}} +
+
Nickname
- {{$diaspora.nickname}} + {{$diaspora.nickname}}
-
-
Full name
+
+
Full_name
{{$diaspora.fullname}}
- -
-
First name
+
+
Searchable
+
+ {{$diaspora.searchable}} +
+
+
+
First_name
{{$diaspora.firstname}}
-
Family name
+
Family_name
{{$diaspora.lastname}}
-
URL
+
Url
- {{$diaspora.podloc}}/ + {{$diaspora.podloc}}/
@@ -38,21 +49,15 @@
-
Photo
+
Photo_medium
-
Photo
+
Photo_small
-
-
Searchable
-
- {{$diaspora.searchable}} -
-
diff --git a/view/templates/xrd_host.tpl b/view/templates/xrd_host.tpl index 29d9e7a6d..5df18b173 100644 --- a/view/templates/xrd_host.tpl +++ b/view/templates/xrd_host.tpl @@ -1,11 +1,10 @@ - {{$zhost}} - + {{$bigkey}} - -