diff options
| author | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
| commit | 6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d (patch) | |
| tree | 12f8b318971d1a1eebbb318e3c19142a56dce444 /plugins/OStatus/lib/discoveryhints.php | |
| parent | 8a2144aeed2e338ef1b21425b9387086790aa820 (diff) | |
| parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins/OStatus/lib/discoveryhints.php')
| -rw-r--r-- | plugins/OStatus/lib/discoveryhints.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 80cfbbf15..34c9be277 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -30,6 +30,7 @@ class DiscoveryHints { case Discovery::PROFILEPAGE: $hints['profileurl'] = $link['href']; break; + case Salmon::NS_MENTIONS: case Salmon::NS_REPLIES: $hints['salmon'] = $link['href']; break; @@ -83,7 +84,7 @@ class DiscoveryHints { $hints['fullname'] = implode(' ', $hcard['n']); } - if (array_key_exists('photo', $hcard)) { + if (array_key_exists('photo', $hcard) && count($hcard['photo'])) { $hints['avatar'] = $hcard['photo'][0]; } |