From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Jun 2009 11:12:30 +0000 (+0100)
Subject: Update IkiWiki::openiduser to work with Net::OpenID 2.x
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c3dd0ff5c7c10743107f203a5b456fdcd1b171df?hp=-c

Update IkiWiki::openiduser to work with Net::OpenID 2.x

openiduser previously used a constructor that no longer works in 2.x.
However, all we actually want is the (undocumented) DisplayOfURL function
that is invoked by the display method, so try to use that.
---

c3dd0ff5c7c10743107f203a5b456fdcd1b171df
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 2c9ada238..b4b52fe2f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -204,8 +204,18 @@ sub openiduser ($) {
 
 	if ($user =~ m!^https?://! &&
 	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
-		my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
-		my $display=$oid->display;
+		my $display;
+
+		if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) {
+			# this works in at least 2.x
+			$display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user);
+		}
+		else {
+			# this only works in 1.x
+			my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+			$display=$oid->display;
+		}
+
 		# Convert "user.somehost.com" to "user [somehost.com]"
 		# (also "user.somehost.co.uk")
 		if ($display !~ /\[/) {