diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-26 20:15:42 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-26 20:15:42 -0700 |
| commit | e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8 (patch) | |
| tree | 8a7661ce547aa252bf943d8f8f990a55d9aac360 /include/network.php | |
| parent | ec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff) | |
| download | volse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.tar.gz volse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.tar.bz2 volse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.zip | |
issue #442, tables contain too much whitespace (there's a definite issue here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem).
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php index 91dac936e..96bf714f6 100644 --- a/include/network.php +++ b/include/network.php @@ -1336,8 +1336,20 @@ function discover_by_webbie($webbie) { $fullname = $vcard['fn']; if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0)) $vcard['photo'] = $diaspora_base . '/' . $vcard['photo']; + if(($vcard['key']) && (! $pubkey)) + $pubkey = $vcard['key']; if(! $avatar) $avatar = $vcard['photo']; + if($diaspora) { + if(($vcard['guid']) && (! $diaspora_guid)) + $diaspora_guid = $vcard['guid']; + if(($vcard['url']) && (! $diaspora_base)) + $diaspora_base = $vcard['url']; + + + + + } } } |