diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
| commit | 5bf49dabc673dbb0180d16ea81435ecac874e5a3 (patch) | |
| tree | 1c0ec7591a2e18097202a51564746e68c27a6744 /include | |
| parent | 488d5b871407d5be6e4c38692aa7134a1a0e9899 (diff) | |
| parent | 480dac1af2dd5ed5ba3105577559568237fe5d80 (diff) | |
| download | volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.gz volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.bz2 volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 11 |
1 files changed, 7 insertions, 4 deletions
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, )); |