diff options
| author | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
| commit | b0d52943e85bf819d4ddf91127ca25ec7a32c289 (patch) | |
| tree | fcb7c92735bbcbae9359d3fcf91a185226698426 /include/identity.php | |
| parent | 1a3be504516db7106ea0ce385691e5a3eca4c084 (diff) | |
| parent | c5f4e5bac76de93b30c00fa9fb3dc8a559d7b070 (diff) | |
| download | volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.gz volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.bz2 volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index 9335673a0..8b742f53e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -770,9 +770,26 @@ logger('online: ' . $profile['online']); $location = $pdesc = $gender = $marital = $homepage = $online = False; } - $firstname = ((strpos($profile['name'],' ')) - ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']); - $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname)))); + $firstname = ((strpos($profile['channel_name'],' ')) + ? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']); + $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname)))); + + if(get_config('system','diaspora_enabled')) { + $diaspora = array( + 'podloc' => z_root(), + 'searchable' => (($block) ? 'false' : 'true'), + 'nickname' => $profile['channel_address'], + 'fullname' => $profile['channel_name'], + 'firstname' => $firstname, + 'lastname' => $lastname, + 'photo300' => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg', + 'photo100' => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg', + 'photo50' => z_root() . '/photo/profile/50/' . $profile['uid'] . '.jpg', + ); + } + else + $diaspora = null; + $contact_block = contact_block(); @@ -802,6 +819,7 @@ logger('online: ' . $profile['online']); '$marital' => $marital, '$homepage' => $homepage, '$chanmenu' => $channel_menu, + '$diaspora' => $diaspora, '$contact_block' => $contact_block, )); |