Merge "(bug 40789) Fixed $wgSecureLogin after-login redirect."

diff --combined includes/specials/SpecialUserlogin.php
index 995d879,ca14096..0e0b712
--- 1/includes/specials/SpecialUserlogin.php
--- 2/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@@ -286,7 -286,6 +286,7 @@@ class LoginForm extends SpecialPage 
  
        /**
         * @private
 +       * @throws PermissionsError|ReadOnlyError
         * @return bool|User
         */
        function addNewAccountInternal() {
@@@ -989,9 -988,12 +989,12 @@@
                if ( $wgSecureLogin && !$this->mStickHTTPS ) {
                        $options = array( 'http' );
                        $proto = PROTO_HTTP;
-               } else {
+               } elseif( $wgSecureLogin ) {
                        $options = array( 'https' );
                        $proto = PROTO_HTTPS;
+               } else {
+                       $options = array();
+                       $proto = PROTO_RELATIVE;
                }
  
                if ( $type == 'successredirect' ) {