dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
181ba1d
)
Merge "(bug 40789) Fixed $wgSecureLogin after-login redirect."
author
CSteipp
<csteipp@wikimedia.org>
Tue, 9 Oct 2012 17:37:25 +0000
(17:37 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Tue, 9 Oct 2012 17:37:25 +0000
(17:37 +0000)
includes/specials/SpecialUserlogin.php
patch
|
blob
|
history
diff --git
a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index
995d879
..
0e0b712
100644
(file)
--- a/
includes/specials/SpecialUserlogin.php
+++ b/
includes/specials/SpecialUserlogin.php
@@
-989,9
+989,12
@@
class LoginForm extends SpecialPage {
if ( $wgSecureLogin && !$this->mStickHTTPS ) {
$options = array( 'http' );
$proto = PROTO_HTTP;
- } else {
+ } else
if( $wgSecureLogin )
{
$options = array( 'https' );
$proto = PROTO_HTTPS;
+ } else {
+ $options = array();
+ $proto = PROTO_RELATIVE;
}
if ( $type == 'successredirect' ) {