X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5d5ce9f992707876b31d203c2358857c09fc8617..d65b39fdcbd9e585f8149998fc7c95f8c0079d37:/IkiWiki/Plugin/openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index a24ee7519..e8dbe964f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,12 +26,24 @@ sub formbuilder_setup (@) { #{{{
 	my $form=$params{form};
 	my $session=$params{session};
 	my $cgi=$params{cgi};
+	
+	# Give up if module is unavailable to avoid needing to depend on
+	# it.
+	eval q{use Net::OpenID::Consumer};
+	if ($@) {
+		debug("unable to load Net::OpenID::Consumer, not enabling OpenID login");
+		return;
+	}
 
 	if ($form->title eq "signin") {
+		# This avoids it displaying a redundant label for the
+		# OpenID fieldset.
+		$form->fieldsets("OpenID");
+
  		$form->field(
 			name => "openid_url",
-			label => "OpenID",
-			fieldset => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
+			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			fieldset => "OpenID",
 			size => 30,
 			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
 		);