diff options
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rw-r--r-- | include/identity.php | 11 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 8ded8b44a..b01074eaa 100755 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ *.lock *.kate-swp #Ignore emacs tempfiles -.#* +\#* # patch attempts *.orig *.rej diff --git a/include/identity.php b/include/identity.php index f63b576b2..079c1a245 100644 --- a/include/identity.php +++ b/include/identity.php @@ -724,12 +724,13 @@ function profile_load(&$a, $nickname, $profile = '') { $p[0]['extra_fields'] = $extra_fields; - $z = q("select xchan_photo_date from xchan where xchan_hash = '%s' limit 1", + $z = q("select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1", dbesc($p[0]['channel_hash']) ); - if($z) + if($z) { $p[0]['picdate'] = $z[0]['xchan_photo_date']; - + $p[0]['reddress'] = str_replace('@','＠',$z[0]['xchan_addr']); + } // fetch user tags if this isn't the default profile @@ -817,6 +818,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $location = false; $address = false; $pdesc = true; + $reddress = true; if((! is_array($profile)) && (! count($profile))) return $o; @@ -906,7 +908,7 @@ logger('online: ' . $profile['online']); } if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { - $location = $pdesc = $gender = $marital = $homepage = $online = False; + $location = $reddress = $pdesc = $gender = $marital = $homepage = $online = False; } $firstname = ((strpos($profile['channel_name'],' ')) @@ -957,6 +959,7 @@ logger('online: ' . $profile['online']); '$homepage' => $homepage, '$chanmenu' => $channel_menu, '$diaspora' => $diaspora, + '$reddress' => $reddress, '$rating' => $z, '$contact_block' => $contact_block, )); diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index cae920c5d..2964d9c4b 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ {{/if}} <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> - + {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> |