| Index: trunk/extensions/OpenID/SpecialOpenIDLogin.body.php |
| — | — | @@ -451,7 +451,7 @@ |
| 452 | 452 | return; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | | - $user = self::getUser( $openid ); |
| | 455 | + $user = self::getUserFromUrl( $openid ); |
| 456 | 456 | |
| 457 | 457 | if ( $user instanceof User ) { |
| 458 | 458 | $this->updateUser( $user, $sreg, $ax ); # update from server |
| Index: trunk/extensions/OpenID/SpecialOpenID.body.php |
| — | — | @@ -347,7 +347,7 @@ |
| 348 | 348 | return $openid_urls; |
| 349 | 349 | } |
| 350 | 350 | |
| 351 | | - public function getUser( $openid ) { |
| | 351 | + public static function getUserFromUrl( $openid ) { |
| 352 | 352 | $dbr = wfGetDB( DB_SLAVE ); |
| 353 | 353 | |
| 354 | 354 | $id = $dbr->selectField( |
| Index: trunk/extensions/OpenID/SpecialOpenIDConvert.body.php |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | # Is this ID already taken? |
| 79 | | - $other = $this->getUser( $openid_url ); |
| | 79 | + $other = self::getUserFromUrl( $openid_url ); |
| 80 | 80 | |
| 81 | 81 | if ( isset( $other ) ) { |
| 82 | 82 | if ( $other->getId() == $wgUser->getID() ) { |
| — | — | @@ -160,7 +160,7 @@ |
| 161 | 161 | global $wgUser, $wgOut, $wgRequest, $wgOpenIDOnly; |
| 162 | 162 | |
| 163 | 163 | $openid = $wgRequest->getVal( 'url' ); |
| 164 | | - $user = self::getUser( $openid ); |
| | 164 | + $user = self::getUserFromUrl( $openid ); |
| 165 | 165 | |
| 166 | 166 | if ( $user->getId() == 0 || $user->getId() != $wgUser->getId() ) { |
| 167 | 167 | $wgOut->showErrorPage( 'openiderror', 'openidconvertothertext' ); |
| — | — | @@ -239,7 +239,7 @@ |
| 240 | 240 | # We check again for dupes; this may be normalized or |
| 241 | 241 | # reformatted by the server. |
| 242 | 242 | |
| 243 | | - $other = $this->getUser( $openid_url ); |
| | 243 | + $other = self::getUserFromUrl( $openid_url ); |
| 244 | 244 | |
| 245 | 245 | if ( isset( $other ) ) { |
| 246 | 246 | if ( $other->getId() == $wgUser->getID() ) { |