diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
| commit | 0ae1e4cc0e598eacfeb508d11db81c33169631fd (patch) | |
| tree | f779fd1bd4b4eaae315473ea70f9c1e85a7981d1 /IkiWiki/Plugin/openid.pm | |
| parent | b3f7c6a9a579208f555a9ae7a409474d68897d04 (diff) | |
| parent | 18bb93f5744c1b57b929d9f8a6042e51fc5256f0 (diff) | |
| download | ikiwiki-0ae1e4cc0e598eacfeb508d11db81c33169631fd.tar ikiwiki-0ae1e4cc0e598eacfeb508d11db81c33169631fd.tar.gz | |
Merge remote branch 'smcv/ready/localurl'
Diffstat (limited to 'IkiWiki/Plugin/openid.pm')
| -rw-r--r-- | IkiWiki/Plugin/openid.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index fae9fb77f..0220a3cf6 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -77,7 +77,7 @@ sub openid_selector { my $template=IkiWiki::template("openid-selector.tmpl"); $template->param( - cgiurl => $config{cgiurl}, + cgiurl => IkiWiki::cgiurl(), (defined $openid_error ? (openid_error => $openid_error) : ()), (defined $openid_url ? (openid_url => $openid_url) : ()), ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()), @@ -148,7 +148,7 @@ sub validate ($$$;$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=$config{cgiurl} if ! defined $cgiurl; + $cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl; my $trust_root=$config{openid_realm}; $trust_root=$cgiurl if ! defined $trust_root; @@ -175,7 +175,7 @@ sub auth ($$) { IkiWiki::redirect($q, $setup_url); } elsif ($csr->user_cancel) { - IkiWiki::redirect($q, $config{url}); + IkiWiki::redirect($q, IkiWiki::baseurl(undef)); } elsif (my $vident = $csr->verified_identity) { $session->param(name => $vident->url); @@ -249,7 +249,7 @@ sub getobj ($$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=$config{cgiurl} if ! defined $cgiurl; + $cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl; return Net::OpenID::Consumer->new( ua => $ua, |