From f4262696ad9250ca14ba89849270dfeb3518c38d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Mar 2011 10:54:24 -0400 Subject: [PATCH] robustness fix Don't fail if libravatar fails for some reason. Reasons I can think of: * too old version to do openid lookups (fall back to email lookup) * network problem perhaps --- IkiWiki/Plugin/comments.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index df20e7b96..fcce6c5a6 100755 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -189,13 +189,18 @@ sub preprocess { $commentauthor = $commentuser; } - eval 'use Libravatar::URL'; + eval q{use Libravatar::URL}; if (! $@) { if (defined $commentopenid) { - $commentauthoravatar = libravatar_url(openid => $commentopenid, https => $ENV{HTTPS}); + eval { + $commentauthoravatar = libravatar_url(openid => $commentopenid, https => $ENV{HTTPS}); + } } - elsif (my $email = IkiWiki::userinfo_get($commentuser, 'email')) { - $commentauthoravatar = libravatar_url(email => $email, https => $ENV{HTTPS}); + if (! defined $commentauthoravatar && + (my $email = IkiWiki::userinfo_get($commentuser, 'email'))) { + eval { + $commentauthoravatar = libravatar_url(email => $email, https => $ENV{HTTPS}); + } } } } -- 2.32.0.93.g670b81a890