diff options
| author | Simon McVittie <smcv@debian.org> | 2015-05-27 08:52:01 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2015-05-27 08:52:01 +0100 |
| commit | 2afb0dd66332136f47d08f2ee4de292eb73c8779 (patch) | |
| tree | 8f0e79228de5c762870730689ceabb6a9a112c25 /IkiWiki/Plugin | |
| parent | 9ab3d2a6be367b745ad0240e5fb68590c7f850b2 (diff) | |
| download | ikiwiki-2afb0dd66332136f47d08f2ee4de292eb73c8779.tar ikiwiki-2afb0dd66332136f47d08f2ee4de292eb73c8779.tar.gz | |
Do not directly enable emailauth by default, only indirectly via openid
This avoids nasty surprises on upgrade if a site is using httpauth,
or passwordauth with an account_creation_password, and relying on
only a select group of users being able to edit the site. We can revisit
this for ikiwiki 4.
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/openid.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index cc4b4ba3d..35ef52a58 100644 --- 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", |