From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Mar 2011 14:54:24 +0000 (-0400)
Subject: robustness fix
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f4262696ad9250ca14ba89849270dfeb3518c38d

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
---

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});
+				}
 			}
 		}
 	}