| Index: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1075,7 +1075,7 @@ |
| 1076 | 1076 | |
| 1077 | 1077 | // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| 1078 | 1078 | // Ditto for signupend |
| 1079 | | - $usingHTTPS = WebRequest::detectProtocol(); |
| | 1079 | + $usingHTTPS = WebRequest::detectProtocol() == 'https'; |
| 1080 | 1080 | $loginendHTTPS = wfMessage( 'loginend-https' ); |
| 1081 | 1081 | $signupendHTTPS = wfMessage( 'signupend-https' ); |
| 1082 | 1082 | if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) { |
| Property changes on: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1083 | 1083 | Merged /branches/wmf-deployment/includes/specials/SpecialUserlogin.php:r53381,56967,60970 |
| 1084 | 1084 | Merged /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:r51646 |
| 1085 | 1085 | Merged /branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php:r67177,69199,76243,77266 |
| 1086 | 1086 | Merged /branches/sqlite/includes/specials/SpecialUserlogin.php:r58211-58321 |
| 1087 | 1087 | Merged /trunk/phase3/includes/specials/SpecialUserlogin.php:r85099,98774 |