Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 67b8cd387a947a201463a5bf6254eddf26be1808..35ef52a581e745a38d11b5d43a57d8dc4cab558e 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -11,6 +11,7 @@ sub import {
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",
                call => \&formbuilder_setup, last => 1);
+       IkiWiki::loadplugin("emailauth");
        IkiWiki::loadplugin("loginselector");
        IkiWiki::Plugin::loginselector::register_login_plugin(
                "openid",
@@ -63,7 +64,7 @@ sub openid_check_input ($) {
        defined $q->param("action") && $q->param("action") eq "verify" && defined $openid_url && length $openid_url;
 }
 
-sub openid_auth ($$$) {
+sub openid_auth ($$$$) {
        my $q=shift;
        my $session=shift;
        my $errordisplayer=shift;