urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert cgiurl change that broke openid login

master
Joey Hess 2010-12-25 14:23:55 -04:00
parent beae7ef9db
commit 93d7368a32
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/openid.pm
View File

@ -148,7 +148,7 @@ sub validate ($$$;$) {
}
my $cgiurl=$config{openid_cgiurl};
$cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl;
$cgiurl=$config{cgiurl} if ! defined $cgiurl;
my $trust_root=$config{openid_realm};
$trust_root=$cgiurl if ! defined $trust_root;
@ -249,7 +249,7 @@ sub getobj ($$) {
}
my $cgiurl=$config{openid_cgiurl};
$cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl;
$cgiurl=$config{cgiurl} if ! defined $cgiurl;
return Net::OpenID::Consumer->new(
ua => $ua,

8
doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
View File

@ -321,3 +321,11 @@ Potential future things:
>> to the top of the wiki --[[smcv]]
[[merged|done]] --[[Joey]]
----
Update: I had to revert part of 296e5cb2fd3690e998b3824d54d317933c595873,
since it broke openid logins. The openid object requires a complete,
not a relative cgiurl. I'm not sure if my changing that back to using
`$config{cgiurl}` will force users back to eg, the non-https version of a
site when logging in via openid. smcv? --[[Joey]]