| Index: trunk/extensions/OpenID/SpecialOpenIDLogin.body.php |
| — | — | @@ -409,10 +409,7 @@ |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | $wgUser = $user; |
| 413 | | - RequestContext::getMain()->setUser( $wgUser ); |
| 414 | | - |
| 415 | 413 | $this->clearValues(); |
| 416 | | - |
| 417 | 414 | $this->displaySuccessLogin( $openid ); |
| 418 | 415 | } |
| 419 | 416 | |
| — | — | @@ -472,7 +469,6 @@ |
| 473 | 470 | if ( $user instanceof User ) { |
| 474 | 471 | $this->updateUser( $user, $sreg, $ax ); # update from server |
| 475 | 472 | $wgUser = $user; |
| 476 | | - RequestContext::getMain()->setUser( $wgUser ); |
| 477 | 473 | $this->displaySuccessLogin( $openid ); |
| 478 | 474 | } else { |
| 479 | 475 | // if we are hardcoding nickname, and a valid e-mail address was returned, create a user with this name |
| — | — | @@ -585,6 +581,7 @@ |
| 586 | 582 | global $wgUser, $wgOut; |
| 587 | 583 | |
| 588 | 584 | $this->setupSession(); |
| | 585 | + RequestContext::getMain()->setUser( $wgUser ); |
| 589 | 586 | $wgUser->SetCookies(); |
| 590 | 587 | |
| 591 | 588 | # Run any hooks; ignore results |
| Index: trunk/extensions/OpenID/OpenID.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | exit( 1 ); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | | -define( 'MEDIAWIKI_OPENID_VERSION', '0.934-beta' ); |
| | 31 | +define( 'MEDIAWIKI_OPENID_VERSION', '0.935-beta 20110830' ); |
| 32 | 32 | |
| 33 | 33 | $path = dirname( __FILE__ ); |
| 34 | 34 | set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . get_include_path() ); |