| Index: trunk/extensions/CentralAuth/CentralAuthPlugin.php |
| — | — | @@ -260,7 +260,9 @@ |
| 261 | 261 | |
| 262 | 262 | $template->set( 'usedomain', false ); |
| 263 | 263 | |
| 264 | | - if ( !$wgCentralAuthCookies ) return; |
| | 264 | + if ( !$wgCentralAuthCookies ) { |
| | 265 | + return; |
| | 266 | + } |
| 265 | 267 | |
| 266 | 268 | $label = Xml::checkLabel( wfMsg( 'centralauth-login-global' ), 'wpCentralLogin', 'wpCentralLogin', true, array( 'tabindex' => '4' ) ); |
| 267 | 269 | $field = <<<HTML |
| Index: trunk/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -164,8 +164,11 @@ |
| 165 | 165 | return true; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | | - if ( !$wgRequest->getCheck( 'wpCentralLogin' ) ) { |
| | 168 | + if ( !$wgRequest->getCheck( 'wpCentralLogin' ) && !$wgRequest->getVal( 'wpCreateaccount' ) ) { |
| 169 | 169 | // The user requested to log in just on this wiki |
| | 170 | + // Or they just created an account |
| | 171 | + // Thankfully, we don't have the awful "Also log me in to other wikis of the Wikimedia Foundation" |
| | 172 | + // on the registration form too... Though, that would've caused this to not happen |
| 170 | 173 | return true; |
| 171 | 174 | } |
| 172 | 175 | |