]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
bugfix
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:28:59 +0000 (21:28 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 01:28:59 +0000 (21:28 -0400)
Always load IkiWiki::CGI so its cgi_signin is present, so we replace it.

IkiWiki/Plugin/openid.pm

index 427d614578bf7c5a9f4bdf64e83f45f28f23a6e2..7e4d0844ac3ead92a6c36a060f05597da9784d18 100644 (file)
@@ -23,9 +23,9 @@ sub checkconfig () {
                # 
                # When other auth hooks are registered, give the selector
                # a reference to the normal signin form.
                # 
                # When other auth hooks are registered, give the selector
                # a reference to the normal signin form.
+               require IkiWiki::CGI;
                my $real_cgi_signin;
                if (keys %{$IkiWiki::hooks{auth}} > 1) {
                my $real_cgi_signin;
                if (keys %{$IkiWiki::hooks{auth}} > 1) {
-                       require IkiWiki::CGI;
                        $real_cgi_signin=\&IkiWiki::cgi_signin;
                }
                inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
                        $real_cgi_signin=\&IkiWiki::cgi_signin;
                }
                inject(name => "IkiWiki::cgi_signin", call => sub ($$) {