reset setuptype to standard after an automator setup file is loaded

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 79a610e20e1d50905e0a76e73bf13b080d3c7c3e..9f694e18ed739c9bcd0d245cad6986b136535d0b 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -39,6 +39,7 @@ sub sanitize_wikiname ($) {
 sub import (@) {
        my $this=shift;
        IkiWiki::Setup::merge({@_});
+       $config{setuptype}='Standard';
 
        if (! $config{force_overwrite}) {
                # Avoid overwriting any existing files.
@@ -144,7 +145,7 @@ sub import (@) {
 
        # Create admin user(s).
        foreach my $admin (@{$config{adminuser}}) {
-               next if $admin=~/^http\?:\/\//; # openid
+               next if defined IkiWiki::openiduser($admin);
                
                # Prompt for password w/o echo.
                my ($password, $password2);