diff --git a/include/identity.php b/include/identity.php index 3ab65d9e64..a785ce981d 100644 --- a/include/identity.php +++ b/include/identity.php @@ -62,7 +62,7 @@ if(! function_exists('profile_load')) { if($profile) { $profile_int = intval($profile); - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` + $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1", dbesc($nickname), @@ -70,7 +70,7 @@ if(! function_exists('profile_load')) { ); } if((!$r) && (!count($r))) { - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` + $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile` INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1", dbesc($nickname) diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl index fe5762973f..05e44432fd 100644 --- a/view/templates/profile_vcard.tpl +++ b/view/templates/profile_vcard.tpl @@ -3,7 +3,7 @@
{{$profile.name}}
- + {{if $profile.faddr}}
{{$profile.faddr}}
{{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 0198431919..4642fb2b75 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2507,7 +2507,8 @@ aside input[type='text'] { font-weight: bold; } -.vcard .title { +.vcard .title, +.vcard .p-faddr { margin-bottom: 5px; margin-left: 12px; } diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl index 9a34605732..bf2eb27349 100644 --- a/view/theme/duepuntozero/templates/profile_vcard.tpl +++ b/view/theme/duepuntozero/templates/profile_vcard.tpl @@ -3,7 +3,7 @@
{{$profile.name}}
- + {{if $profile.faddr}}
{{$profile.faddr}}
{{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
{{$profile.name}}
@@ -38,12 +38,12 @@